if replicated context starts without clustering enabled, then the map is not swapped...

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@706433 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/ha/context/ReplicatedContext.java b/java/org/apache/catalina/ha/context/ReplicatedContext.java
index 402ea41..50d4edc 100644 (file)
--- a/java/org/apache/catalina/ha/context/ReplicatedContext.java
+++ b/java/org/apache/catalina/ha/context/ReplicatedContext.java
@@ -54,6 +54,7 @@ public class ReplicatedContext extends StandardContext implements LifecycleListe
             startComplete = true;
     }
 
+    @Override
     public synchronized void start() throws LifecycleException {
         if ( this.started ) return;
         super.addLifecycleListener(this);            
@@ -74,13 +75,14 @@ public class ReplicatedContext extends StandardContext implements LifecycleListe
         }
     }
     
+    @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 ){