Mercurial > hg > release > icedtea6-1.8
changeset 1181:4fbf310e08a0
Correct indentation from last commit, remove debug output.
author | Deepak Bhole <dbhole@redhat.com> |
---|---|
date | Wed, 05 Nov 2008 16:23:59 -0500 |
parents | 0a4bbe183246 |
children | 6c81f8c8aab3 |
files | ChangeLog rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java |
diffstat | 2 files changed, 52 insertions(+), 52 deletions(-) [+] |
line wrap: on
line diff
--- 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 Deepak Bhole <dbhole@redhat.com> + + * rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: Correct + indentation from last commit, remove debug output. + 2008-11-05 Gary Benson <gbenson@redhat.com> * contrib/mixtec-hacks.patch: new file.
--- 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 @@ // search this and the extension loaders if (result == null) - try { - result = loadClassExt(name); - } catch (ClassNotFoundException cnfe) { + 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('.', '/')); + // Not found in external loader either. As a last resort, look in any available indexes - if (jarList != null) { - for (String jarName: jarList) { - System.err.println("Jar " + name + " is potentially in " + jarName); + // 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('.', '/')); - JARDesc desc; - try { - desc = new JARDesc(new URL(file.getCodeBase(), jarName), - null, null, false, true, false); - } catch (MalformedURLException mfe) { - throw new ClassNotFoundException(name); - } + 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() - ); + available.add(desc); - 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); - } + 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; - if (u != null) - addURL(u); - - } + try { + u = tracker.getCacheURL(remoteURL); + System.out.println("URL = " + u); + } catch (Exception e) { + throw new ClassNotFoundException(name); + } - // If it still fails, let it error out - result = loadClassExt(name); - - System.err.println("Returning from index: " + result); - } - } - - } + if (u != null) + addURL(u); + + } + + // If it still fails, let it error out + result = loadClassExt(name); + } + } + } return result; }