Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(105)

Unified Diff: pkg/analyzer/lib/src/analyzer_impl.dart

Issue 799063002: Avoid NPE in package resolver if there's a problem running 'pub list' (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analyzer/lib/src/analyzer_impl.dart
diff --git a/pkg/analyzer/lib/src/analyzer_impl.dart b/pkg/analyzer/lib/src/analyzer_impl.dart
index 879a7d9a8f6111d1ff3403602713a7fce8bf38c3..b6e2b23e7f13557f30069b48c365fc988d46ab91 100644
--- a/pkg/analyzer/lib/src/analyzer_impl.dart
+++ b/pkg/analyzer/lib/src/analyzer_impl.dart
@@ -24,6 +24,7 @@ import 'generated/error.dart';
import 'generated/java_io.dart';
import 'generated/sdk_io.dart';
import 'generated/source_io.dart';
+import 'package:analyzer/file_system/file_system.dart';
DirectoryBasedDartSdk sdk;
@@ -151,10 +152,13 @@ class AnalyzerImpl {
new PubPackageMapProvider(PhysicalResourceProvider.INSTANCE, sdk);
PackageMapInfo packageMapInfo = pubPackageMapProvider.computePackageMap(
PhysicalResourceProvider.INSTANCE.getResource('.'));
- resolvers.add(
- new PackageMapUriResolver(
- PhysicalResourceProvider.INSTANCE,
- packageMapInfo.packageMap));
+ Map<String, List<Folder>> packageMap = packageMapInfo.packageMap;
+ if (packageMap != null) {
+ resolvers.add(
+ new PackageMapUriResolver(
+ PhysicalResourceProvider.INSTANCE,
+ packageMap));
+ }
}
}
sourceFactory = new SourceFactory(resolvers);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698