cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject [3/4] git commit: Drop support for Jetty 7.4..... too ancient to worry about
Date Mon, 17 Mar 2014 14:58:32 GMT
Drop support for Jetty 7.4..... too ancient to worry about


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/795a825a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/795a825a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/795a825a

Branch: refs/heads/2.7.x-fixes
Commit: 795a825ad787f80e1c9b85af1888df9981d649ab
Parents: 67910f5
Author: Daniel Kulp <dkulp@apache.org>
Authored: Mon Mar 17 10:45:12 2014 -0400
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Mon Mar 17 10:58:10 2014 -0400

----------------------------------------------------------------------
 .../http_jetty/JettyHTTPServerEngine.java          | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/795a825a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
index 6d92073..8c40149 100644
--- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
+++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
@@ -42,7 +42,6 @@ import org.eclipse.jetty.server.AbstractConnector;
 import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.SessionIdManager;
 import org.eclipse.jetty.server.SessionManager;
 import org.eclipse.jetty.server.handler.ContextHandler;
 import org.eclipse.jetty.server.handler.ContextHandlerCollection;
@@ -420,21 +419,7 @@ public class JettyHTTPServerEngine
             if (sessionManager == null) {
                 sessionManager = new HashSessionManager();
                 HashSessionIdManager idManager = new HashSessionIdManager();
-                
-                try {
-                    //for JETTY 7.5
-                    sessionManager.getClass().getMethod("setSessionIdManager", SessionIdManager.class)
-                        .invoke(sessionManager, idManager);
-                } catch (Exception e) {
-                    //for JETTY <=7.4.x
-                    try {
-                        sessionManager.getClass().getMethod("setIdManager", SessionIdManager.class)
-                            .invoke(sessionManager, idManager);
-                    } catch (Exception e1) {
-                        throw new Fault(new Message("START_UP_SERVER_FAILED_MSG", LOG,
-                                                    e.getMessage(), port), e);          
             
-                    }
-                }
+                sessionManager.setSessionIdManager(idManager);
             }
             SessionHandler sessionHandler = new SessionHandler(sessionManager);
             if (securityHandler != null) {


Mime
View raw message