cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1023994 - in /cxf/branches/2.3.x-fixes: ./ rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
Date Mon, 18 Oct 2010 20:26:18 GMT
Author: dkulp
Date: Mon Oct 18 20:26:18 2010
New Revision: 1023994

URL: http://svn.apache.org/viewvc?rev=1023994&view=rev
Log:
Merged revisions 1023972 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1023972 | dkulp | 2010-10-18 16:04:26 -0400 (Mon, 18 Oct 2010) | 2 lines
  
  Fix issues of sessions not really being usable across endpoints on the
  same port.
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Oct 18 20:26:18 2010
@@ -1 +1 @@
-/cxf/trunk:1-1022129,1022154,1022194,1022401-1022402,1022911,1023068,1023121,1023804,1023971
+/cxf/trunk:1-1022129,1022154,1022194,1022401-1022402,1022911,1023068,1023121,1023804,1023971-1023972

Modified: cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java?rev=1023994&r1=1023993&r2=1023994&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
(original)
+++ cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
Mon Oct 18 20:26:18 2010
@@ -41,6 +41,7 @@ import org.eclipse.jetty.server.Abstract
 import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.SessionManager;
 import org.eclipse.jetty.server.handler.ContextHandler;
 import org.eclipse.jetty.server.handler.ContextHandlerCollection;
 import org.eclipse.jetty.server.handler.DefaultHandler;
@@ -107,6 +108,7 @@ public class JettyHTTPServerEngine
     private JettyConnectorFactory connectorFactory;
     private ContextHandlerCollection contexts;
     
+    private SessionManager sessionManager;
     
     /**
      * This field holds the TLS ServerParameters that are programatically
@@ -398,10 +400,12 @@ public class JettyHTTPServerEngine
         // bind the jetty http handler with the context handler
         if (isSessionSupport) {         
             // If we have sessions, we need two handlers.
-            HashSessionManager sessionManager = new HashSessionManager();
+            if (sessionManager == null) {
+                sessionManager = new HashSessionManager();
+                HashSessionIdManager idManager = new HashSessionIdManager();
+                sessionManager.setIdManager(idManager);
+            }
             SessionHandler sessionHandler = new SessionHandler(sessionManager);
-            HashSessionIdManager idManager = new HashSessionIdManager();
-            sessionManager.setIdManager(idManager);
             HandlerCollection hc = new HandlerCollection();
             hc.addHandler(handler);
             hc.addHandler(sessionHandler);



Mime
View raw message