| commit | 5f477aa7abe160009bc17583fb692f74a6030e35 | [log] [tgz] |
|---|---|---|
| author | Liam Miller-Cushon <cushon@google.com> | Wed Feb 25 19:35:31 2015 +0000 |
| committer | Han-Wen Nienhuys <hanwen@google.com> | Wed Feb 25 19:35:31 2015 +0000 |
| tree | c83cf19e5cce5ccce8f308cc5d15e838209c88f4 | |
| parent | 52ac35666a61d72c7fb105a6deca619af813e568 [diff] |
Rewrite InMemoryJavaFileManager using JavacPathFileManager and Jimfs. -- MOS_MIGRATED_REVID=87175187
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/dependency/ImplicitDependencyExtractor.java b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/dependency/ImplicitDependencyExtractor.java index 6d7d99e..a7663b4 100644 --- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/dependency/ImplicitDependencyExtractor.java +++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/dependency/ImplicitDependencyExtractor.java
@@ -159,6 +159,11 @@ public static String getJarName(JavaFileManager fileManager, JavaFileObject file) { file = unwrapFileObject(file); + fileManager = unwrapFileManager(fileManager); + + if (file == null || fileManager == null) { + return null; + } if (file instanceof ZipArchive.ZipFileObject || file instanceof ZipFileIndexArchive.ZipFileIndexFileObject) {