safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-07 05:31:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-1508: Ensure extension JarFile is always properly closed.

Browse Source
This commit is contained in:
Michael Jumper
2022-01-23 15:04:06 -08:00
parent 7e30b8682a
commit df386bfd10
1 changed files with 73 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
guacamole/src/main/java/org/apache/guacamole/extension/ExtensionClassLoader.java
View File

@@ -216,14 +216,7 @@ public class ExtensionClassLoader extends URLClassLoader {
private static URL[] getExtensionURLs(File extension, private static URL[] getExtensionURLs(File extension,
List<File> temporaryFiles) throws GuacamoleException { List<File> temporaryFiles) throws GuacamoleException {
JarFile extensionJar; try (JarFile extensionJar = new JarFile(extension)) {
try {
extensionJar = new JarFile(extension);
}
catch (IOException e) {
throw new GuacamoleServerException("Contents of extension \""
+ extension + "\" cannot be read.", e);
}
// Include extension itself within classpath // Include extension itself within classpath
List<URL> urls = new ArrayList<>(); List<URL> urls = new ArrayList<>();
@@ -296,6 +289,12 @@ public class ExtensionClassLoader extends URLClassLoader {
return urls.toArray(new URL[0]); return urls.toArray(new URL[0]);
}
catch (IOException e) {
throw new GuacamoleServerException("Contents of extension \""
+ extension + "\" cannot be read.", e);
}
} }
/** /**