aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java6
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 9c21726..dabda97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-10 Jiri Vanek <[email protected]>
+
+ * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java:
+ removed suspicious return when (searchForMain) had null launchDesc
+
2013-11-07 Andrew Azores <[email protected]>
Reproducer test cleanup. Replaced ServerAccess.ProcessResult in favour of
diff --git a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
index b2ea5f8..a9a84ba 100644
--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
@@ -828,11 +828,9 @@ public class JNLPClassLoader extends URLClassLoader {
// Check launch info
if (mainClass == null) {
LaunchDesc launchDesc = file.getLaunchInfo();
- if (launchDesc == null) {
- return;
+ if (launchDesc != null) {
+ mainClass = launchDesc.getMainClass();
}
-
- mainClass = launchDesc.getMainClass();
}
// The main class may be specified in the manifest