Index: pkg/analysis_server/lib/src/analysis_server.dart |
diff --git a/pkg/analysis_server/lib/src/analysis_server.dart b/pkg/analysis_server/lib/src/analysis_server.dart |
index 4552eb8e4852cb36746ed26ba374a47ed874e3a4..34531c68402f067b09086303653ce0da85ddc780 100644 |
--- a/pkg/analysis_server/lib/src/analysis_server.dart |
+++ b/pkg/analysis_server/lib/src/analysis_server.dart |
@@ -1173,8 +1173,10 @@ class ServerContextManager extends ContextManager { |
SourceFactory _createSourceFactory(UriResolver packageUriResolver) { |
List<UriResolver> resolvers = <UriResolver>[ |
new DartUriResolver(analysisServer.defaultSdk), |
- new ResourceUriResolver(resourceProvider), |
- packageUriResolver]; |
+ new ResourceUriResolver(resourceProvider)]; |
+ if (packageUriResolver != null) { |
+ resolvers.add(packageUriResolver); |
+ } |
return new SourceFactory(resolvers); |
} |
} |