changeset in /hg/icedtea6: Correct indentation from last commit,...
Deepak Bhole
dbhole at redhat.com
Wed Nov 5 13:24:03 PST 2008
changeset 4fbf310e08a0 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=4fbf310e08a0
description:
Correct indentation from last commit, remove debug output.
diffstat:
2 files changed, 59 insertions(+), 59 deletions(-)
ChangeLog | 5
rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 113 ++++++++----------
diffs (135 lines):
diff -r 0a4bbe183246 -r 4fbf310e08a0 ChangeLog
--- a/ChangeLog Wed Nov 05 10:58:32 2008 -0500
+++ b/ChangeLog Wed Nov 05 16:23:59 2008 -0500
@@ -1,3 +1,8 @@ 2008-11-05 Gary Benson <gbenson at redhat
+2008-11-05 Deepak Bhole <dbhole at redhat.com>
+
+ * rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: Correct
+ indentation from last commit, remove debug output.
+
2008-11-05 Gary Benson <gbenson at redhat.com>
* contrib/mixtec-hacks.patch: new file.
diff -r 0a4bbe183246 -r 4fbf310e08a0 rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Wed Nov 05 10:58:32 2008 -0500
+++ b/rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Wed Nov 05 16:23:59 2008 -0500
@@ -682,65 +682,60 @@ public class JNLPClassLoader extends URL
// search this and the extension loaders
if (result == null)
- try {
- result = loadClassExt(name);
- } catch (ClassNotFoundException cnfe) {
-
- // Not found in external loader either. As a last resort, look in any available indexes
-
- // Currently this loads jars directly from the site. We cannot cache it because this
- // call is initiated from within the applet, which does not have disk read/write permissions
- for (JarIndex index: jarIndexes) {
- LinkedList<String> jarList = index.get(name.replace('.', '/'));
-
- if (jarList != null) {
- for (String jarName: jarList) {
- System.err.println("Jar " + name + " is potentially in " + jarName);
-
- JARDesc desc;
- try {
- desc = new JARDesc(new URL(file.getCodeBase(), jarName),
- null, null, false, true, false);
- } catch (MalformedURLException mfe) {
- throw new ClassNotFoundException(name);
- }
-
- available.add(desc);
-
- tracker.addResource(desc.getLocation(),
- desc.getVersion(),
- JNLPRuntime.getDefaultUpdatePolicy()
- );
-
- URL remoteURL;
- try {
- remoteURL = new URL(file.getCodeBase() + jarName);
- } catch (MalformedURLException mfe) {
- throw new ClassNotFoundException(name);
- }
-
- URL u;
-
- try {
- u = tracker.getCacheURL(remoteURL);
- System.out.println("URL = " + u);
- } catch (Exception e) {
- throw new ClassNotFoundException(name);
- }
-
- if (u != null)
- addURL(u);
-
- }
-
- // If it still fails, let it error out
- result = loadClassExt(name);
-
- System.err.println("Returning from index: " + result);
- }
- }
-
- }
+ try {
+ result = loadClassExt(name);
+ } catch (ClassNotFoundException cnfe) {
+
+ // Not found in external loader either. As a last resort, look in any available indexes
+
+ // Currently this loads jars directly from the site. We cannot cache it because this
+ // call is initiated from within the applet, which does not have disk read/write permissions
+ for (JarIndex index: jarIndexes) {
+ LinkedList<String> jarList = index.get(name.replace('.', '/'));
+
+ if (jarList != null) {
+ for (String jarName: jarList) {
+ JARDesc desc;
+ try {
+ desc = new JARDesc(new URL(file.getCodeBase(), jarName),
+ null, null, false, true, false);
+ } catch (MalformedURLException mfe) {
+ throw new ClassNotFoundException(name);
+ }
+
+ available.add(desc);
+
+ tracker.addResource(desc.getLocation(),
+ desc.getVersion(),
+ JNLPRuntime.getDefaultUpdatePolicy()
+ );
+
+ URL remoteURL;
+ try {
+ remoteURL = new URL(file.getCodeBase() + jarName);
+ } catch (MalformedURLException mfe) {
+ throw new ClassNotFoundException(name);
+ }
+
+ URL u;
+
+ try {
+ u = tracker.getCacheURL(remoteURL);
+ System.out.println("URL = " + u);
+ } catch (Exception e) {
+ throw new ClassNotFoundException(name);
+ }
+
+ if (u != null)
+ addURL(u);
+
+ }
+
+ // If it still fails, let it error out
+ result = loadClassExt(name);
+ }
+ }
+ }
return result;
}
More information about the distro-pkg-dev
mailing list