Make getMainClass()'s return value consistent for AppletDesc and ApplicationDesc

2011-09-28 Omair Majid <[email protected]>

    * netx/net/sourceforge/jnlp/AppletDesc.java (getMainClass): Clarify the
    return value in javadoc.
    * netx/net/sourceforge/jnlp/Launcher.java
    (createApplet, createAppletObject): Do not replace '/' with '.'.
    * netx/net/sourceforge/jnlp/PluginBridge.java (PluginBridge): Ensure that
    the class name is in the dot-separated from.
    * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
    (checkForMain): Ensure that the name is an exact match.

1 files changed, 2 insertions, 3 deletions

diff --git a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
index 03e3763..412fb21 100644
--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
@@ -580,6 +580,7 @@ public class JNLPClassLoader extends URLClassLoader {
             mainClass = ad.getMainClass();
         } else
             return;
+        String desiredJarEntryName = mainClass + ".class";
 
         for (int i = 0; i < jars.size(); i++) {
 
@@ -599,9 +600,7 @@ public class JNLPClassLoader extends URLClassLoader {
                 while (entries.hasMoreElements()) {
                     je = entries.nextElement();
                     String jeName = je.getName().replaceAll("/", ".");
-
-                    if (!jeName.startsWith(mainClass + "$Inner")
-                            && (jeName.startsWith(mainClass) && jeName.endsWith(".class"))) {
+                    if (jeName.equals(desiredJarEntryName)) {
                         foundMainJar = true;
                         verifySignedJNLP(jars.get(i), jarFile);
                         break;