svn commit: r546133 - /incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java

[almaw]

Author: almaw
Date: Mon Jun 11 05:59:41 2007
New Revision: 546133

URL: http://svn.apache.org/viewvc?view=rev&rev=546133
Log:
WICKET-628, again.

Modified:
    
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java

Modified: 
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
URL: 
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java?view=diff&rev=546133&r1=546132&r2=546133
==============================================================================
--- 
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
 (original)
+++ 
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
 Mon Jun 11 05:59:41 2007
@@ -346,9 +346,13 @@
                }
 
                final ClassLoader previousClassLoader = 
Thread.currentThread().getContextClassLoader();
+               final ClassLoader newClassLoader = getClassLoader();
                try
                {
-                       
Thread.currentThread().setContextClassLoader(getClassLoader());
+                       if (previousClassLoader != newClassLoader)
+                       {
+                               
Thread.currentThread().setContextClassLoader(newClassLoader);
+                       }
 
                        // Try to configure filterPath from web.xml if it's not 
specified as
                        // an init-param.
@@ -411,7 +415,10 @@
                finally
                {
                        Application.unset();
-                       
Thread.currentThread().setContextClassLoader(previousClassLoader);
+                       if (newClassLoader != previousClassLoader)
+                       {
+                               
Thread.currentThread().setContextClassLoader(previousClassLoader);
+                       }
                }
        }