Author: fhanik
Date: Thu Aug 13 23:10:40 2009
New Revision: 804057

URL: http://svn.apache.org/viewvc?rev=804057&view=rev
Log:
Deserialize with the webapp classloader as the context classloader 

Modified:
    tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java

Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java?rev=804057&r1=804056&r2=804057&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java Thu Aug 
13 23:10:40 2009
@@ -169,12 +169,12 @@
             try {
                 lock();
                 ReplicationStream stream = ( (ClusterManager) 
getManager()).getReplicationStream(diff, offset, length);
-                getDeltaRequest().readExternal(stream);
                 ClassLoader contextLoader = 
Thread.currentThread().getContextClassLoader();
                 try {
                     ClassLoader[] loaders = getClassLoaders();
                     if (loaders != null && loaders.length > 0)
                         
Thread.currentThread().setContextClassLoader(loaders[0]);
+                    getDeltaRequest().readExternal(stream);
                     getDeltaRequest().execute(this, 
((ClusterManager)getManager()).isNotifyListenersOnReplication());
                 } finally {
                     
Thread.currentThread().setContextClassLoader(contextLoader);



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to