aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar elenairina <elenairina@google.com>2017-10-12 17:08:45 +0200
committerGravatar Marcel Hlopko <hlopko@google.com>2017-10-13 13:51:56 +0200
commit6d4c1516f33dd132d9c1b2f5b228165975f8d07d (patch)
treedf7970e32c57bc6f1b330f3e0998dfa847fcf7ed /src
parent4b16e02aabf08b154cb2258930e76a59a741206f (diff)
Fix NPE thrown by java_common.compile when no sources are specified.
PiperOrigin-RevId: 171960869
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/java/JavaLibraryHelper.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibraryHelper.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibraryHelper.java
index 9efbc930c1..434bab77c2 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibraryHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibraryHelper.java
@@ -231,11 +231,14 @@ public final class JavaLibraryHelper {
.addTransitiveArgs(directArgs, BOTH)
.addTransitiveDependencies(deps, true /* recursive */)
.build();
-
+ Artifact compileTimeDepArtifact = artifacts.getCompileTimeDependencyArtifact();
+ NestedSet<Artifact> compileTimeJavaDepArtifacts = compileTimeDepArtifact != null
+ ? NestedSetBuilder.create(Order.STABLE_ORDER, compileTimeDepArtifact)
+ : NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER);
return JavaCompilationArgsProvider.create(
isReportedAsStrict ? directArgs : transitiveArgs,
transitiveArgs,
- NestedSetBuilder.create(Order.STABLE_ORDER, artifacts.getCompileTimeDependencyArtifact()),
+ compileTimeJavaDepArtifacts,
NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER));
}