diff options
| author |  Kristina Chodorow <kchodorow@google.com> | 2016-07-20 14:55:53 +0000 |
|---|---|---|
| committer |  John Cater <jcater@google.com> | 2016-07-20 15:02:10 +0000 |
| commit | 2479405822a955d009ad5f4e170391a75f5e33c5 (patch) | |
| tree | 3240735e4534dc0052f043fdd6a9887346cb8671 /src/main/java | |
| parent | b47f344508faa2d2ba8dc93a58546c0ebe9d6584 (diff) | |
Fix NPE with unset maven_jar sha1
Fixes #1537.
--
MOS_MIGRATED_REVID=127945452
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/bazel/repository/MavenJarFunction.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/MavenJarFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/MavenJarFunction.java index 8e2693b4ad..28c4a00dcc 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/repository/MavenJarFunction.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/MavenJarFunction.java @@ -180,8 +180,9 @@ public class MavenJarFunction extends HttpArchiveFunction { this.outputDirectory = outputDirectory; this.artifact = mapper.get("artifact", Type.STRING); - this.sha1 = (mapper.has("sha1", Type.STRING)) ? mapper.get("sha1", Type.STRING) : null; - if (!sha1.matches("\\p{XDigit}{40}")) { + this.sha1 = mapper.isAttributeValueExplicitlySpecified("sha1") + ? mapper.get("sha1", Type.STRING) : null; + if (sha1 != null && !sha1.matches("\\p{XDigit}{40}")) { throw new IOException("Invalid SHA-1 for maven_jar " + name + ": '" + sha1 + "'"); } this.url = serverValue.getUrl(); |