geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgenen...@apache.org
Subject svn commit: r376109 - in /geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat: listener/DispatchListener.java realm/TomcatGeronimoRealm.java
Date Wed, 08 Feb 2006 23:09:04 GMT
Author: jgenender
Date: Wed Feb  8 15:09:02 2006
New Revision: 376109

URL: http://svn.apache.org/viewcvs?rev=376109&view=rev
Log:
Tidy up code

Modified:
    geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/listener/DispatchListener.java
    geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/realm/TomcatGeronimoRealm.java

Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/listener/DispatchListener.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/listener/DispatchListener.java?rev=376109&r1=376108&r2=376109&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/listener/DispatchListener.java
(original)
+++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/listener/DispatchListener.java
Wed Feb  8 15:09:02 2006
@@ -35,7 +35,6 @@
 
 public class DispatchListener implements InstanceListener {
 
-    // private static StackThreadLocal currentContext = new ThreadLocal();
     private static ThreadLocal currentContext = new ThreadLocal() {
         protected Object initialValue() {
             return new Stack();
@@ -97,8 +96,7 @@
         Mapper mapper = webContext.getMapper();
         MessageBytes mb = MessageBytes.newInstance();
         
-        String dispatchPath = null;
-        dispatchPath = 
+        String dispatchPath =
             (String) request.getAttribute(Globals.DISPATCHER_REQUEST_PATH_ATTR);
         mb.setString(dispatchPath);
         

Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/realm/TomcatGeronimoRealm.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/realm/TomcatGeronimoRealm.java?rev=376109&r1=376108&r2=376109&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/realm/TomcatGeronimoRealm.java
(original)
+++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/realm/TomcatGeronimoRealm.java
Wed Feb  8 15:09:02 2006
@@ -181,9 +181,8 @@
             }
         }
         
-        Wrapper servletWrapper = request.getWrapper();
-        String name = servletWrapper.getName();
-        currentRequestWrapperName.set(name);
+        //Set the current wrapper name (Servlet mapping)
+        currentRequestWrapperName.set(request.getWrapper().getName());
 
         // Which user principal have we already authenticated?
         Principal principal = request.getUserPrincipal();



Mime
View raw message