diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 16 |
2 files changed, 18 insertions, 5 deletions
@@ -1,3 +1,10 @@ +2012-01-05 Omair Majid <[email protected]> + + * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java + (initializeResources): Only throw exceptions about the main class not + being found when the jnlp file can have a main class. + (addToCodeBaseLoader): Dont try to process null URLs. + 2011-12-15 Jiri Vanek <[email protected]> * configure.ac: added search for xsltproc program and setting diff --git a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java index dda154e..ba7f744 100644 --- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java @@ -488,11 +488,14 @@ public class JNLPClassLoader extends URLClassLoader { // If jar with main class was not found and there are no more // available jars, throw a LaunchException - if (!foundMainJar - && (available == null || available.size() == 0)) - throw new LaunchException(file, null, R("LSFatal"), - R("LCClient"), R("LCantDetermineMainClass"), - R("LCantDetermineMainClassInfo")); + if (file.getLaunchInfo() instanceof AppletDesc || + file.getLaunchInfo() instanceof ApplicationDesc) { + if (!foundMainJar + && (available == null || available.size() == 0)) + throw new LaunchException(file, null, R("LSFatal"), + R("LCClient"), R("LCantDetermineMainClass"), + R("LCantDetermineMainClassInfo")); + } // If main jar was found, but a signed JNLP file was not located if (!isSignedJNLP && foundMainJar) @@ -1700,6 +1703,9 @@ public class JNLPClassLoader extends URLClassLoader { * @throws IllegalArgumentException If the given url is not a path */ private void addToCodeBaseLoader(URL u) { + if (u == null) { + return; + } // Only paths may be added if (!u.getFile().endsWith("/")) { |