Author: pbenedict
Date: Tue Nov 6 22:48:04 2007
New Revision: 592631
URL: http://svn.apache.org/viewvc?rev=592631&view=rev
Log:
STR-3110: Release log factory last
Modified:
struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionServlet.java
Modified:
struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionServlet.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionServlet.java?rev=592631&r1=592630&r2=592631&view=diff
==============================================================================
---
struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionServlet.java
(original)
+++
struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionServlet.java
Tue Nov 6 22:48:04 2007
@@ -300,6 +300,9 @@
destroyInternal();
getServletContext().removeAttribute(Globals.ACTION_SERVLET_KEY);
+ CatalogFactory.clear();
+ PropertyUtils.clearDescriptors();
+
// Release our LogFactory and Log instances (if any)
ClassLoader classLoader =
Thread.currentThread().getContextClassLoader();
@@ -324,9 +327,6 @@
Bugzilla #14042. It was committed for version 1.136 by craigmcc
*/
}
-
- CatalogFactory.clear();
- PropertyUtils.clearDescriptors();
}
/**
