You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by lh...@apache.org on 2010/05/14 05:08:44 UTC

svn commit: r944090 - /incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/servlet/AbstractShiroFilter.java

Author: lhazlewood
Date: Fri May 14 03:08:44 2010
New Revision: 944090

URL: http://svn.apache.org/viewvc?rev=944090&view=rev
Log:
SHIRO-159: Added a little extra cleanup logic to the unbind method just in case.

Modified:
    incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/servlet/AbstractShiroFilter.java

Modified: incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/servlet/AbstractShiroFilter.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/servlet/AbstractShiroFilter.java?rev=944090&r1=944089&r2=944090&view=diff
==============================================================================
--- incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/servlet/AbstractShiroFilter.java (original)
+++ incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/servlet/AbstractShiroFilter.java Fri May 14 03:08:44 2010
@@ -231,7 +231,11 @@ public abstract class AbstractShiroFilte
      */
     @SuppressWarnings({"UnusedDeclaration"})
     protected void unbind(ThreadState threadState) {
-        threadState.clear();
+        if ( threadState != null ) {
+            threadState.clear();
+        }
+        //just for good measure (SHIRO-159):
+        ThreadContext.clear();
     }
 
     /**