opendev/gerrit
Code Issues Proposed changes

Throw IOException from JarScanner constructor

Browse Source 
The constructor of JarScanner is throwing an InvalidPluginException
when an IOException occurs while loading a JAR file. This exception is
too specific here and it should be the responsibility of the caller to
decide whether a given JAR file is a plugin or not. Therefore this
constructor should throw a generic IOException instead.

Change-Id: I60099f9cec0837e6bf9a72af0d085f9731495c14
Signed-off-by: Dariusz Luksza <dariusz@luksza.org>
This commit is contained in:
Dariusz Luksza
2015-02-05 17:25:38 +01:00
parent c2ceaccd55
commit 5436ff9c23
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gerrit-server/src/main/java/com/google/gerrit/server/plugins/JarPluginProvider.java
View File

@@ -142,9 +142,10 @@ public class JarPluginProvider implements ServerPluginProvider {
new URLClassLoader(urls.toArray(new URL[urls.size()]),
PluginLoader.parentFor(type));
JarScanner jarScanner = createJarScanner(srcJar);
ServerPlugin plugin =
new ServerPlugin(name, description.canonicalUrl, description.user,
srcJar, snapshot, new JarScanner(srcJar), description.dataDir,
srcJar, snapshot, jarScanner, description.dataDir,
pluginLoader);
plugin.setCleanupHandle(new CleanupHandle(tmp, jarFile));
keep = true;
@@ -155,4 +156,13 @@ public class JarPluginProvider implements ServerPluginProvider {
}
}
}
private JarScanner createJarScanner(File srcJar)
throws InvalidPluginException {
try {
return new JarScanner(srcJar);
} catch (IOException e) {
throw new InvalidPluginException("Cannot scan plugin file " + srcJar, e);
}
}
}

8
gerrit-server/src/main/java/com/google/gerrit/server/plugins/JarScanner.java
View File

@@ -67,12 +67,8 @@ public class JarScanner implements PluginContentScanner {
private final JarFile jarFile;
public JarScanner(File srcFile) throws InvalidPluginException {
try {
this.jarFile = new JarFile(srcFile);
} catch (IOException e) {
throw new InvalidPluginException("Cannot scan plugin file " + srcFile, e);
}
public JarScanner(File srcFile) throws IOException {
this.jarFile = new JarFile(srcFile);
}
@Override