If we are reloading the context, we must get rid of the old instance manager, it...

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

diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java
index b9f7e67..109b29f 100644 (file)
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -4601,6 +4601,9 @@ public class StandardContext
             log.error( "Error reseting context " + this + " " + ex, ex );
         }
         
+        //reset the instance manager
+        instanceManager = null;
+
         // Notify our interested LifecycleListeners
         lifecycle.fireLifecycleEvent(AFTER_STOP_EVENT, null);