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

GUAC-969: Fix possible NPE in GuacamoleClassLoader, if the contents of the lib directory cannot be listed.

Browse Source
This commit is contained in:
Michael Jumper
2014-12-27 14:04:10 -08:00
parent fd38d918bb
commit fa3ccb9711
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
guacamole/src/main/java/org/glyptodon/guacamole/net/basic/GuacamoleClassLoader.java
View File

@@ -105,7 +105,7 @@ public class GuacamoleClassLoader extends ClassLoader {
// Get list of URLs for all .jar's in the lib directory // Get list of URLs for all .jar's in the lib directory
Collection<URL> jarURLs = new ArrayList<URL>(); Collection<URL> jarURLs = new ArrayList<URL>();
for (File file : libDirectory.listFiles(new FilenameFilter() { File[] files = libDirectory.listFiles(new FilenameFilter() {
@Override @Override
public boolean accept(File dir, String name) { public boolean accept(File dir, String name) {
@@ -115,13 +115,17 @@ public class GuacamoleClassLoader extends ClassLoader {
} }
})) { });
// Verify directory was successfully read
if (files == null)
throw new GuacamoleException("Unable to read contents of directory " + libDirectory);
// Add the URL for each .jar to the jar URL list
for (File file : files) {
try { try {
// Add URL for the .jar to the jar URL list
jarURLs.add(file.toURI().toURL()); jarURLs.add(file.toURI().toURL());
} }
catch (MalformedURLException e) { catch (MalformedURLException e) {
throw new GuacamoleException(e); throw new GuacamoleException(e);