Revision: 1231
http://stripes.svn.sourceforge.net/stripes/?rev=1231&view=rev
Author: bengunter
Date: 2010-05-18 15:13:02 +0000 (Tue, 18 May 2010)
Log Message:
-----------
Check for null before calling destroy() on stripesDispatcher and stripesFilter.
Set dispatcherServlet field to null after destroy.
Modified Paths:
--------------
branches/1.5.x/stripes/src/net/sourceforge/stripes/controller/DynamicMappingFilter.java
Modified:
branches/1.5.x/stripes/src/net/sourceforge/stripes/controller/DynamicMappingFilter.java
===================================================================
---
branches/1.5.x/stripes/src/net/sourceforge/stripes/controller/DynamicMappingFilter.java
2010-05-18 14:26:16 UTC (rev 1230)
+++
branches/1.5.x/stripes/src/net/sourceforge/stripes/controller/DynamicMappingFilter.java
2010-05-18 15:13:02 UTC (rev 1231)
@@ -367,11 +367,14 @@
public void destroy() {
try {
- stripesDispatcher.destroy();
+ if (stripesDispatcher != null)
+ stripesDispatcher.destroy();
}
finally {
+ stripesDispatcher = null;
+
try {
- if (stripesFilterIsInternal)
+ if (stripesFilterIsInternal && stripesFilter != null)
stripesFilter.destroy();
}
finally {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
Stripes-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/stripes-development
