[RFC] Netx: setting context classloader properly for all threads

[Man Wong]

----- "Deepak Bhole" <dbhole at redhat.com> wrote:

> * Man Wong <mwong at redhat.com> [2010-07-29 14:23]:
> > This patch forces the creation of Event Awt thread before the
> thread
> > launching the application sets the contextclassloader for itself,
> > and its child(ren). This essentially make sure Event Awt thread
> gets
> > the correct contextclassloader. 
> > 
> > It also fixes along with changesets
> > 4bcc2702e0ec and 867af494861c the issue with launching the set of
> > simulation applications mentioned in icedtea bug 486 (which
> > effectively allows us to close that bug).
> > 
> > Ok to push?
> > 
> 
> Looks good. Please go ahead and commit to HEAD, 1.6, 1.7 and 1.8.
> 

Committed as:
6aee53732aa2 - 1.6
9e75f57aae29 - 1.7
846a4c007c96 - 1.8
4bd31caf5e07 - head

Thanks,
Man Lung Wong

> Cheers,
> Deepak
> 
> > Thanks,
> > Man Lung Wong
> 
> > diff -r dd4d9f50ac7c netx/net/sourceforge/jnlp/Launcher.java
> > --- a/netx/net/sourceforge/jnlp/Launcher.java	Mon Jul 26 09:38:47
> 2010 +0100
> > +++ b/netx/net/sourceforge/jnlp/Launcher.java	Tue Jul 27 17:08:46
> 2010 -0400
> > @@ -42,6 +42,8 @@
> >  import net.sourceforge.jnlp.services.ServiceUtil;
> >  import net.sourceforge.jnlp.util.Reflect;
> >  
> > +import javax.swing.SwingUtilities;
> > +
> >  /**
> >   * Launches JNLPFiles either in the foreground or background.<p>
> >   *
> > @@ -442,6 +444,11 @@
> >              Method main = mainClass.getDeclaredMethod("main", new
> Class[] {String[].class} );
> >              String args[] = file.getApplication().getArguments();
> >  
> > +            SwingUtilities.invokeAndWait(new Runnable() {
> > +                // dummy method to force Event Dispatch Thread
> creation
> > +                public void run(){}
> > +            });
> > +
> >             
> setContextClassLoaderForAllThreads(app.getThreadGroup(),
> app.getClassLoader());
> >  
> >              if (splashScreen != null) {
> > diff -r dd4d9f50ac7c
> netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java
> > --- a/netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java	Mon
> Jul 26 09:38:47 2010 +0100
> > +++ b/netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java	Tue
> Jul 27 17:08:46 2010 -0400
> > @@ -104,43 +104,9 @@
> >      /** weak reference to most app who's windows was most recently
> activated */
> >      private WeakReference activeApplication = null;
> >  
> > -    /** listener installs the app's classloader on the event
> dispatch thread */
> > -    private ContextUpdater contextListener = new ContextUpdater();
> > -
> >      /** Sets whether or not exit is allowed (in the context of the
> plugin, this is always false) */
> >      private boolean exitAllowed = true;
> >  
> > -    private class ContextUpdater extends WindowAdapter implements
> PrivilegedAction {
> > -        private ApplicationInstance app = null;
> > -
> > -        public void windowActivated(WindowEvent e) {
> > -            app = getApplication(e.getWindow());
> > -            AccessController.doPrivileged(this);
> > -            app = null;
> > -        }
> > -
> > -        public Object run() {
> > -            if (app != null) {
> > -               
> Thread.currentThread().setContextClassLoader(app.getClassLoader());
> > -                activeApplication = new WeakReference(app);
> > -            }
> > -            else
> > -               
> Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
> > -
> > -            return null;
> > -        }
> > -
> > -        public void windowDeactivated(WindowEvent e) {
> > -            activeApplication = null;
> > -        }
> > -
> > -        public void windowClosing(WindowEvent e) {
> > -                System.err.println("Disposing window");
> > -                e.getWindow().dispose();
> > -        }
> > -    };
> > -
> > -
> >      /**
> >       * Creates a JNLP SecurityManager.
> >       */
> > @@ -524,8 +490,6 @@
> >              weakWindows.add(window); // for mapping window -> app
> >              weakApplications.add(app);
> >  
> > -            w.addWindowListener(contextListener); // for dynamic
> context classloader
> > -
> >              app.addWindow(w);
> >          }
> >