You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by fh...@apache.org on 2008/11/11 22:29:35 UTC

svn commit: r713177 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/ha/context/ReplicatedContext.java

Author: fhanik
Date: Tue Nov 11 13:29:34 2008
New Revision: 713177

URL: http://svn.apache.org/viewvc?rev=713177&view=rev
Log:
Fix class cast exception

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=713177&r1=713176&r2=713177&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Nov 11 13:29:34 2008
@@ -160,11 +160,6 @@
             really old to me, so where would this come from ?)
   -1: 
 
-* Fix classcast exception upon shutdown(edgecase)
-  http://svn.apache.org/viewvc?rev=706433&view=rev 
-  +1: fhanik, markt, pero
-  -1: 
-  
 * maxThreads to be 200 by default
   http://svn.apache.org/viewvc?rev=707264&view=rev 
   +1: fhanik, markt, pero, remm

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java?rev=713177&r1=713176&r2=713177&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java Tue Nov 11 13:29:34 2008
@@ -54,6 +54,7 @@
             startComplete = true;
     }
 
+    @Override
     public synchronized void start() throws LifecycleException {
         if ( this.started ) return;
         super.addLifecycleListener(this);            
@@ -74,13 +75,14 @@
         }
     }
     
+    @Override
     public synchronized void stop() throws LifecycleException
     {
-        ReplicatedMap map = (ReplicatedMap)((ReplApplContext)this.context).getAttributeMap();
-        if ( map!=null ) {
-            map.breakdown();
-        }
         if ( !this.started ) return;
+        AbstractMap map = (AbstractMap)((ReplApplContext)this.context).getAttributeMap();
+        if ( map!=null && map instanceof ReplicatedMap) {
+            ((ReplicatedMap)map).breakdown();
+        }
         try {
             super.lifecycle.removeLifecycleListener(this);
         } catch ( Exception x ){



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