geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke...@apache.org
Subject svn commit: r922137 - in /geronimo/server/trunk/plugins/jetty8: geronimo-jetty8-clustering-wadi/src/main/java/org/apache/geronimo/jetty8/cluster/ClusteredSessionHandler.java pom.xml
Date Fri, 12 Mar 2010 04:16:47 GMT
Author: kevan
Date: Fri Mar 12 04:16:47 2010
New Revision: 922137

URL: http://svn.apache.org/viewvc?rev=922137&view=rev
Log:
didn't meant to commit these files

Modified:
    geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-clustering-wadi/src/main/java/org/apache/geronimo/jetty8/cluster/ClusteredSessionHandler.java
    geronimo/server/trunk/plugins/jetty8/pom.xml

Modified: geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-clustering-wadi/src/main/java/org/apache/geronimo/jetty8/cluster/ClusteredSessionHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-clustering-wadi/src/main/java/org/apache/geronimo/jetty8/cluster/ClusteredSessionHandler.java?rev=922137&r1=922136&r2=922137&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-clustering-wadi/src/main/java/org/apache/geronimo/jetty8/cluster/ClusteredSessionHandler.java
(original)
+++ geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-clustering-wadi/src/main/java/org/apache/geronimo/jetty8/cluster/ClusteredSessionHandler.java
Fri Mar 12 04:16:47 2010
@@ -32,19 +32,11 @@ import org.eclipse.jetty.server.Request;
  * @version $Rev$ $Date$
  */
 public class ClusteredSessionHandler extends SessionHandler {
-    private final PreHandler chainedHandler;
-    
-    public ClusteredSessionHandler(ClusteredSessionManager sessionManager, PreHandler chainedHandler)
{
-        if (null == chainedHandler) {
-            throw new IllegalArgumentException("chainedHandler is required");
-        }
-        this.chainedHandler = chainedHandler;
-        chainedHandler.setNextHandler(new ActualHandler());
 
+    public ClusteredSessionHandler(ClusteredSessionManager sessionManager, PreHandler chainedHandler)
{
         setSessionManager(sessionManager);
     }
     
-    @Override
     public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse
response)
             throws IOException, ServletException {
         setRequestedId(baseRequest, request);
@@ -55,9 +47,10 @@ public class ClusteredSessionHandler ext
         }
     }
     
-    protected void doHandle(String target, Request baseRequest, HttpServletRequest request,
HttpServletResponse response)
+    public void doHandle(String target, Request baseRequest, HttpServletRequest request,
HttpServletResponse response)
             throws IOException, ServletException {
-        super.handle(target, baseRequest, request, response);
+        setRequestedId(baseRequest, request);
+        super.doHandle(target, baseRequest, request, response);
     }
 
     private class ActualHandler extends AbstractPreHandler {

Modified: geronimo/server/trunk/plugins/jetty8/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/pom.xml?rev=922137&r1=922136&r2=922137&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty8/pom.xml Fri Mar 12 04:16:47 2010
@@ -34,7 +34,7 @@
     </description>
 
     <properties>
-        <jettyVersion>8.0.0.M0</jettyVersion>
+        <jettyVersion>8.0.0.M0-SNAPSHOT</jettyVersion>
     </properties>
 
     <dependencyManagement>



Mime
View raw message