tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1384885 - /tomcat/sandbox/trunk-resources/java/org/apache/catalina/core/StandardContext.java
Date Fri, 14 Sep 2012 18:54:53 GMT
Author: markt
Date: Fri Sep 14 18:54:52 2012
New Revision: 1384885

URL: http://svn.apache.org/viewvc?rev=1384885&view=rev
Log:
Don't set resources to null on stop. destroy() needs to unregister them.

Modified:
    tomcat/sandbox/trunk-resources/java/org/apache/catalina/core/StandardContext.java

Modified: tomcat/sandbox/trunk-resources/java/org/apache/catalina/core/StandardContext.java
URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-resources/java/org/apache/catalina/core/StandardContext.java?rev=1384885&r1=1384884&r2=1384885&view=diff
==============================================================================
--- tomcat/sandbox/trunk-resources/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/sandbox/trunk-resources/java/org/apache/catalina/core/StandardContext.java Fri
Sep 14 18:54:52 2012
@@ -4812,12 +4812,10 @@ public class StandardContext extends Con
             if (resources != null) {
                 resources.stop();
             }
-            this.resources = null;
         } catch (Throwable t) {
             ExceptionUtils.handleThrowable(t);
             log.error(sm.getString("standardContext.resourcesStop"), t);
             ok = false;
-            this.resources = null;
         } finally {
             writeLock.unlock();
         }



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


Mime
View raw message