← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/openjdk-6/jaunty-security

« back to all changes in this revision

Viewing changes to rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose, Edward Nevill, Matthias Klose
  • Date: 2009-03-02 16:18:01 UTC
  • Revision ID: james.westby@ubuntu.com-20090302161801-rubk3yhm8j0au4y1
Tags: 6b14-0ubuntu17
[ Edward Nevill ]
* Remove VFP from asm loop
* Disble the mauve testsuite for armel.

[Matthias Klose]
* Update IcedTea (20090302).

Show diffs side-by-side

added added

removed removed

Lines of Context:
rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
233
233
     * @param location the file's location
234
234
     * @param policy the update policy to use when downloading resources
235
235
     */
236
 
    public static JNLPClassLoader getInstance(URL location, UpdatePolicy policy) throws IOException, ParseException, LaunchException {
 
236
    public static JNLPClassLoader getInstance(URL location, String cookieStr, UpdatePolicy policy) throws IOException, ParseException, LaunchException {
237
237
        JNLPClassLoader loader = (JNLPClassLoader) urlToLoader.get(location);
238
238
 
239
239
        if (loader == null)
240
 
            loader = getInstance(new JNLPFile(location, false, policy), policy);
 
240
            loader = getInstance(new JNLPFile(location, cookieStr, false, policy), policy);
241
241
 
242
242
        return loader;
243
243
    }
255
255
                //if (ext != null) {
256
256
                for (int i=0; i < ext.length; i++) {
257
257
                try {
258
 
                        JNLPClassLoader loader = getInstance(ext[i].getLocation(), updatePolicy);
 
258
                        JNLPClassLoader loader = getInstance(ext[i].getLocation(), ext[i].getCookieStr(), updatePolicy);
259
259
                        loaderList.add(loader);
260
260
                }
261
261
                catch (Exception ex) {
312
312
            if (jars[i].isEager())
313
313
                initialJars.add(jars[i]); // regardless of part
314
314
 
315
 
            tracker.addResource(jars[i].getLocation(), 
 
315
            tracker.addResource(jars[i].getLocation(),
 
316
                                file.getCookieStr(),
316
317
                                jars[i].getVersion(), 
317
318
                                jars[i].isCacheable() ? JNLPRuntime.getDefaultUpdatePolicy() : UpdatePolicy.FORCE
318
319
                               );
730
731
                            available.add(desc);
731
732
 
732
733
                            tracker.addResource(desc.getLocation(), 
 
734
                                    file.getCookieStr(),
733
735
                                    desc.getVersion(), 
734
736
                                    JNLPRuntime.getDefaultUpdatePolicy()
735
737
                            );