aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/java_tools
diff options
context:
space:
mode:
authorGravatar cushon <cushon@google.com>2018-06-17 21:01:51 -0700
committerGravatar Copybara-Service <copybara-piper@google.com>2018-06-17 21:03:01 -0700
commit4a9c3bca5da2e71003583f0a808dd8d638c80d04 (patch)
tree29779e31ffe864b02461800e4a24426676acadea /src/java_tools
parent1ee5e0c716b4c579af0cdd52f76d0d61fedb1231 (diff)
Improve error message for invalid srcjar inputs
Fixes #5418 RELNOTES: N/A PiperOrigin-RevId: 200934846
Diffstat (limited to 'src/java_tools')
-rw-r--r--src/java_tools/buildjar/java/com/google/devtools/build/buildjar/SimpleJavaLibraryBuilder.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/SimpleJavaLibraryBuilder.java b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/SimpleJavaLibraryBuilder.java
index 483b871d51..a90bc060e0 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/SimpleJavaLibraryBuilder.java
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/SimpleJavaLibraryBuilder.java
@@ -29,6 +29,7 @@ import java.nio.file.FileSystems;
import java.nio.file.FileVisitResult;
import java.nio.file.Files;
import java.nio.file.Path;
+import java.nio.file.ProviderNotFoundException;
import java.nio.file.SimpleFileVisitor;
import java.nio.file.attribute.BasicFileAttributes;
import java.util.HashMap;
@@ -227,7 +228,12 @@ public class SimpleJavaLibraryBuilder implements Closeable {
private FileSystem getJarFileSystem(Path sourceJar) throws IOException {
FileSystem fs = filesystems.get(sourceJar);
if (fs == null) {
- filesystems.put(sourceJar, fs = FileSystems.newFileSystem(sourceJar, null));
+ try {
+ fs = FileSystems.newFileSystem(sourceJar, null);
+ } catch (ProviderNotFoundException e) {
+ throw new IOException(String.format("unable to open %s as a jar file", sourceJar), e);
+ }
+ filesystems.put(sourceJar, fs);
}
return fs;
}