Skip to content

Fix NPE in JRTUtil #1155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iloveeclipse merged 1 commit into from
Jun 20, 2023
Merged

Fix NPE in JRTUtil #1155

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 41 additions & 8 deletions org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/util/JRTUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
import java.io.InputStream;
Expand Down Expand Up @@ -238,35 +239,67 @@ public static void reset() {
* @throws IOException
*/
public static void walkModuleImage(File image, final JRTUtil.JrtFileVisitor<java.nio.file.Path> visitor, int notify) throws IOException {
getJrtSystem(image, null).walkModuleImage(visitor, notify);
JrtFileSystem system = getJrtSystem(image, null);
if (system == null) {
return;
}
system.walkModuleImage(visitor, notify);
}

public static void walkModuleImage(File image, String release, final JRTUtil.JrtFileVisitor<java.nio.file.Path> visitor, int notify) throws IOException {
getJrtSystem(image, release).walkModuleImage(visitor, notify);
JrtFileSystem system = getJrtSystem(image, release);
Comment thread
iloveeclipse marked this conversation as resolved.
if (system == null) {
return;
}
system.walkModuleImage(visitor, notify);
}

public static InputStream getContentFromJrt(File jrt, String fileName, String module) throws IOException {
return getJrtSystem(jrt).getContentFromJrt(fileName, module);
JrtFileSystem system = getJrtSystem(jrt);
if (system == null) {
throw new FileNotFoundException(String.valueOf(jrt));
}
return system.getContentFromJrt(fileName, module);
}

public static byte[] getClassfileContent(File jrt, String fileName, String module) throws IOException {
return getJrtSystem(jrt).getClassfileContent(fileName, module);
JrtFileSystem system = getJrtSystem(jrt);
if (system == null) {
throw new FileNotFoundException(String.valueOf(jrt));
}
return system.getClassfileContent(fileName, module);
}

public static ClassFileReader getClassfile(File jrt, String fileName, String module) throws IOException, ClassFormatException {
return getJrtSystem(jrt).getClassfile(fileName, module);
JrtFileSystem system = getJrtSystem(jrt);
if (system == null) {
throw new FileNotFoundException(String.valueOf(jrt));
}
return system.getClassfile(fileName, module);
}

public static ClassFileReader getClassfile(File jrt, String fileName, String module, Predicate<String> moduleNameFilter) throws IOException, ClassFormatException {
return getJrtSystem(jrt).getClassfile(fileName, module, moduleNameFilter);
JrtFileSystem system = getJrtSystem(jrt);
if (system == null) {
throw new FileNotFoundException(String.valueOf(jrt));
}
return system.getClassfile(fileName, module, moduleNameFilter);
}

public static List<String> getModulesDeclaringPackage(File jrt, String qName, String moduleName) {
return getJrtSystem(jrt).getModulesDeclaringPackage(qName, moduleName);
JrtFileSystem system = getJrtSystem(jrt);
if (system == null) {
return List.of();
}
return system.getModulesDeclaringPackage(qName, moduleName);
}

public static boolean hasCompilationUnit(File jrt, String qualifiedPackageName, String moduleName) {
return getJrtSystem(jrt).hasClassFile(qualifiedPackageName, moduleName);
JrtFileSystem system = getJrtSystem(jrt);
if (system == null) {
return false;
}
return system.hasClassFile(qualifiedPackageName, moduleName);
}

/*
Expand Down