tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kfuj...@apache.org
Subject svn commit: r936655 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/ha/session/BackupManager.java webapps/docs/changelog.xml
Date Thu, 22 Apr 2010 08:46:58 GMT
Author: kfujino
Date: Thu Apr 22 08:46:58 2010
New Revision: 936655

URL: http://svn.apache.org/viewvc?rev=936655&view=rev
Log:
Fixed for BZ49151.

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

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=936655&r1=936654&r2=936655&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Apr 22 08:46:58 2010
@@ -280,14 +280,6 @@ PATCHES PROPOSED TO BACKPORT:
   +1: kkolinko, markt
   -1:
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49151
-  Avoid ClassCastException.
-  http://svn.apache.org/viewvc?view=revision&revision=935510
-  +1: kfujino
-  +1: kkolinko: and also +1 for http://svn.apache.org/viewvc?rev=935777&view=rev
-  +1: markt: and also +1 for http://svn.apache.org/viewvc?rev=935777&view=rev
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49158
   http://svn.apache.org/viewvc?view=revision&revision=935998
   +1: fhanik, markt

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java?rev=936655&r1=936654&r2=936655&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java Thu Apr 22
08:46:58 2010
@@ -227,9 +227,8 @@ public class BackupManager extends Stand
      */
     public void stop() throws LifecycleException
     {
-        
-        LazyReplicatedMap map = (LazyReplicatedMap)sessions;
-        if ( map!=null ) {
+        if (sessions instanceof LazyReplicatedMap) {
+            LazyReplicatedMap map = (LazyReplicatedMap)sessions;
             map.breakdown();
         }
         if ( !this.started ) return;

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=936655&r1=936654&r2=936655&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Apr 22 08:46:58 2010
@@ -125,6 +125,10 @@
         <bug>48934</bug>: Previous fix to handle dropped connections incorrectly
         permanently disabled session replication. (fhanik)
       </fix>
+      <fix>
+        <bug>49151</bug>: Avoid ClassCastException in BackupManager#stop. 
+        (kfujino)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Other">



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


Mime
View raw message