geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r750994 - in /geronimo/server/trunk/plugins: jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/handler/ tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/interceptor/
Date Fri, 06 Mar 2009 17:34:04 GMT
Author: gawor
Date: Fri Mar  6 17:34:04 2009
New Revision: 750994

URL: http://svn.apache.org/viewvc?rev=750994&view=rev
Log:
Clear PolicyContext handler data object. Not optimal but better than before (GERONIMO-4574)

Modified:
    geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/handler/JettySecurityHandler.java
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/interceptor/PolicyContextBeforeAfter.java

Modified: geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/handler/JettySecurityHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/handler/JettySecurityHandler.java?rev=750994&r1=750993&r2=750994&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/handler/JettySecurityHandler.java
(original)
+++ geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/handler/JettySecurityHandler.java
Fri Mar  6 17:34:04 2009
@@ -114,6 +114,8 @@
             super.handle(target, request, response, dispatch);
         } finally {
             PolicyContext.setContextID(old_policy_id);
+            // Must unset handler data from thread - see GERONIMO-4574
+            PolicyContext.setHandlerData(null);
             ContextManager.popCallers(oldCallers);
         }
     }

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/interceptor/PolicyContextBeforeAfter.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/interceptor/PolicyContextBeforeAfter.java?rev=750994&r1=750993&r2=750994&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/interceptor/PolicyContextBeforeAfter.java
(original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/interceptor/PolicyContextBeforeAfter.java
Fri Mar  6 17:34:04 2009
@@ -72,7 +72,8 @@
 
         //Replace the old
         PolicyContext.setContextID((String)context[policyContextIDIndex]);
-        PolicyContext.setHandlerData(httpRequest);
+        // Must unset handler data from thread - see GERONIMO-4574
+        PolicyContext.setHandlerData(null);
         ContextManager.popCallers((Callers) context[callersIndex]);
         if (httpRequest != null)
             httpRequest.setAttribute(DEFAULT_SUBJECT, context[defaultSubjectIndex]);



Mime
View raw message