tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fha...@apache.org
Subject svn commit: r811098 - in /tomcat/tc6.0.x/trunk: java/org/apache/catalina/ha/session/DeltaSession.java webapps/docs/changelog.xml
Date Thu, 03 Sep 2009 19:55:26 GMT
Author: fhanik
Date: Thu Sep  3 19:55:26 2009
New Revision: 811098

URL: http://svn.apache.org/viewvc?rev=811098&view=rev
Log:
Fix deserialization calls, where objects call Thread.currentThread.getContextClassLoader

Modified:
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java?rev=811098&r1=811097&r2=811098&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java Thu Sep  3
19:55:26 2009
@@ -168,12 +168,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);

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=811098&r1=811097&r2=811098&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Sep  3 19:55:26 2009
@@ -206,6 +206,7 @@
   </subsection>
   <subsection name="Cluster">
     <changelog>
+      <update>Perform deserializtion events with context class loader</update>
       <fix><bug>47515</bug>Correctly replicate timestamp during startup</fix>
       <fix><bug>47478</bug>Call replication listeners when using BackupManager</fix>
       <fix>



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


Mime
View raw message