diff options
author | Damien Martin-Guillerez <dmarting@google.com> | 2016-01-21 19:55:07 +0000 |
---|---|---|
committer | Damien Martin-Guillerez <dmarting@google.com> | 2016-01-22 15:53:30 +0000 |
commit | 49978055a2ecca23df5fed892fc529e235ae9f07 (patch) | |
tree | 4615f3a8c2bd0c073c21d835e5b6f248442f12d8 /src/main | |
parent | 1a34a248b05c9e64e2db0d76f3ad8e93cf755f99 (diff) |
Fix NullPointerException in DelegatingWalkableGraph
Package name comparison did not included the repository name which
leads to a crash when trying to build :* targets.
Fixes #792.
--
MOS_MIGRATED_REVID=112708531
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/packages/Package.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/packages/Package.java b/src/main/java/com/google/devtools/build/lib/packages/Package.java index 5c04220a06..51a496dc7a 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/Package.java +++ b/src/main/java/com/google/devtools/build/lib/packages/Package.java @@ -1331,7 +1331,7 @@ public class Package { * an InputFile target. */ void createInputFileMaybe(Label label, Location location) { - if (label != null && label.getPackageFragment().equals(pkg.getNameFragment())) { + if (label != null && label.getPackageIdentifier().equals(pkg.getPackageIdentifier())) { if (!targets.containsKey(label.getName())) { addInputFile(label, location); } |