/hg/icedtea6: Make child JNLPs use the same classloader as paren...
cpdev-commits at icedtea.classpath.org
cpdev-commits at icedtea.classpath.org
Tue Aug 25 07:16:26 PDT 2009
changeset 8362dc30d8d3 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=8362dc30d8d3
summary: Make child JNLPs use the same classloader as parent for a given instance.
diffstat:
4 files changed, 108 insertions(+), 16 deletions(-)
ChangeLog | 16 ++++
rt/net/sourceforge/jnlp/JNLPFile.java | 38 ++++++++++
rt/net/sourceforge/jnlp/PluginBridge.java | 6 +
rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 64 +++++++++++++-----
diffs (211 lines):
diff -r ea895e1bbf2d -r 8362dc30d8d3 ChangeLog
--- a/ChangeLog Fri Aug 21 16:24:12 2009 +0200
+++ b/ChangeLog Tue Aug 25 10:20:21 2009 -0400
@@ -1,3 +1,19 @@ 2009-08-21 Xerxes RÃ¥nby <xerxes at zafen
+2009-08-25 Deepak Bhole <dbhole at redhat.com>
+
+ * rt/net/sourceforge/jnlp/JNLPFile.java: Add a new key variable that is
+ unique to each instance.
+ (JNLPFile): Existing constructor changed to generate a new key on call.
+ (JNLPFile): New constructor that takes a key. If called, sets the file's
+ key to it.
+ (getUniqueKey): Returns the unique key for the instance.
+ * rt/net/sourceforge/jnlp/PluginBridge.java: Generate new instance
+ specific unique key.
+ * rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
+ (getInstance): Use unique instance keys to determine which classloader to
+ use, rather than using the URL.
+ (getInstance): Same.
+ (initializeExtensions): Provide unique key to getInstance.
+
2009-08-21 Xerxes RÃ¥nby <xerxes at zafena.se>
* ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
diff -r ea895e1bbf2d -r 8362dc30d8d3 rt/net/sourceforge/jnlp/JNLPFile.java
--- a/rt/net/sourceforge/jnlp/JNLPFile.java Fri Aug 21 16:24:12 2009 +0200
+++ b/rt/net/sourceforge/jnlp/JNLPFile.java Tue Aug 25 10:20:21 2009 -0400
@@ -23,6 +23,7 @@ import java.net.URL;
import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Calendar;
import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
@@ -66,6 +67,9 @@ public class JNLPFile {
/** the network location of this JNLP file */
protected URL fileLocation;
+
+ /** A key that uniquely identifies connected instances (main jnlp+ext) */
+ protected String uniqueKey = null;
/** the URL used to resolve relative URLs in the file */
protected URL codeBase;
@@ -171,6 +175,33 @@ public class JNLPFile {
parse(root, strict, location);
this.fileLocation = location;
+
+ this.uniqueKey = Calendar.getInstance().getTimeInMillis() + "-" +
+ Math.abs(((new java.util.Random()).nextInt())) + "-" +
+ location;
+
+ if (JNLPRuntime.isDebug())
+ System.err.println("UNIQUEKEY=" + this.uniqueKey);
+ }
+
+ /**
+ * Create a JNLPFile from a URL, parent URLm a version and checking for
+ * updates using the specified policy.
+ *
+ * @param location the location of the JNLP file
+ * @param uniqueKey A string that uniquely identifies connected instances
+ * @param version the version of the JNLP file
+ * @param strict whether to enforce the spec when
+ * @param policy the update policy
+ * @throws IOException if an IO exception occurred
+ * @throws ParseException if the JNLP file was invalid
+ */
+ public JNLPFile(URL location, String uniqueKey, Version version, boolean strict, UpdatePolicy policy) throws IOException, ParseException {
+ this(location, version, strict, policy);
+ this.uniqueKey = uniqueKey;
+
+ if (JNLPRuntime.isDebug())
+ System.err.println("UNIQUEKEY (override) =" + this.uniqueKey);
}
/**
@@ -245,6 +276,13 @@ public class JNLPFile {
*/
public URL getFileLocation() {
return fileLocation;
+ }
+
+ /**
+ * Returns the location of the parent file if it exists, null otherwise
+ */
+ public String getUniqueKey() {
+ return uniqueKey;
}
/**
diff -r ea895e1bbf2d -r 8362dc30d8d3 rt/net/sourceforge/jnlp/PluginBridge.java
--- a/rt/net/sourceforge/jnlp/PluginBridge.java Fri Aug 21 16:24:12 2009 +0200
+++ b/rt/net/sourceforge/jnlp/PluginBridge.java Tue Aug 25 10:20:21 2009 -0400
@@ -24,6 +24,7 @@ package net.sourceforge.jnlp;
import java.net.URL;
import java.net.MalformedURLException;
+import java.util.Calendar;
import java.util.Hashtable;
import java.util.Locale;
import java.util.List;
@@ -103,7 +104,10 @@ public class PluginBridge extends JNLPFi
codebase.getHost());
else
security = null;
-
+
+ this.uniqueKey = Calendar.getInstance().getTimeInMillis() + "-" +
+ Math.abs(((new java.util.Random()).nextInt())) + "-" +
+ documentBase;
}
public String getTitle()
diff -r ea895e1bbf2d -r 8362dc30d8d3 rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Fri Aug 21 16:24:12 2009 +0200
+++ b/rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Tue Aug 25 10:20:21 2009 -0400
@@ -209,21 +209,54 @@ public class JNLPClassLoader extends URL
* @param policy the update policy to use when downloading resources
*/
public static JNLPClassLoader getInstance(JNLPFile file, UpdatePolicy policy) throws LaunchException {
+ JNLPClassLoader baseLoader = null;
JNLPClassLoader loader = null;
- URL location = file.getFileLocation();
-
- if (location != null)
- loader = (JNLPClassLoader) urlToLoader.get(location);
+ String uniqueKey = file.getUniqueKey();
+
+ if (uniqueKey != null)
+ baseLoader = (JNLPClassLoader) urlToLoader.get(uniqueKey);
try {
- if (loader == null)
- loader = new JNLPClassLoader(file, policy);
+
+ // If base loader is null, or the baseloader's file and this
+ // file is different, initialize a new loader
+ if (baseLoader == null ||
+ !baseLoader.getJNLPFile().getFileLocation().equals(file.getFileLocation())) {
+
+ loader = new JNLPClassLoader(file, policy);
+
+ // New loader init may have caused extentions to create a
+ // loader for this unique key. Check.
+ JNLPClassLoader extLoader = (JNLPClassLoader) urlToLoader.get(uniqueKey);
+
+ if (extLoader != null) {
+ for (URL u : loader.getURLs())
+ extLoader.addURL(u);
+
+ loader = extLoader;
+ }
+
+ // loader is now current + ext. But we also need to think of
+ // the baseLoader
+ if (baseLoader != null) {
+ for (URL u : loader.getURLs())
+ baseLoader.addURL(u);
+
+ loader = baseLoader;
+ }
+
+ } else {
+ // if key is same and locations match, this is the loader we want
+ loader = baseLoader;
+ }
+
} catch (LaunchException e) {
throw e;
}
- if (file.getInformation().isSharingAllowed())
- urlToLoader.put(location, loader);
+ // loaders are mapped to a unique key. Only extensions and parent
+ // share a key, so it is safe to always share based on it
+ urlToLoader.put(uniqueKey, loader);
return loader;
}
@@ -236,12 +269,12 @@ public class JNLPClassLoader extends URL
* @param version the file's version
* @param policy the update policy to use when downloading resources
*/
- public static JNLPClassLoader getInstance(URL location, Version version, UpdatePolicy policy)
+ public static JNLPClassLoader getInstance(URL location, String uniqueKey, Version version, UpdatePolicy policy)
throws IOException, ParseException, LaunchException {
- JNLPClassLoader loader = (JNLPClassLoader) urlToLoader.get(location);
-
- if (loader == null)
- loader = getInstance(new JNLPFile(location, version, false, policy), policy);
+ JNLPClassLoader loader = (JNLPClassLoader) urlToLoader.get(uniqueKey);
+
+ if (loader == null || !location.equals(loader.getJNLPFile().getFileLocation()))
+ loader = getInstance(new JNLPFile(location, uniqueKey, version, false, policy), policy);
return loader;
}
@@ -259,8 +292,9 @@ public class JNLPClassLoader extends URL
//if (ext != null) {
for (int i=0; i < ext.length; i++) {
try {
- JNLPClassLoader loader = getInstance(ext[i].getLocation(), ext[i].getVersion(), updatePolicy);
- loaderList.add(loader);
+ String uniqueKey = this.getJNLPFile().getUniqueKey();
+ JNLPClassLoader loader = getInstance(ext[i].getLocation(), uniqueKey, ext[i].getVersion(), updatePolicy);
+ loaderList.add(loader);
}
catch (Exception ex) {
ex.printStackTrace();
More information about the distro-pkg-dev
mailing list