Author: dkulp
Date: Wed Sep 14 17:43:47 2011
New Revision: 1170730
URL: http://svn.apache.org/viewvc?rev=1170730&view=rev
Log:
Get the JettyHTTPServerEngine able to support both Jetty 7.5 and 7.4
Modified:
cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
Modified:
cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java?rev=1170730&r1=1170729&r2=1170730&view=diff
==============================================================================
---
cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
(original)
+++
cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
Wed Sep 14 17:43:47 2011
@@ -43,6 +43,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.SessionIdManager;
import org.eclipse.jetty.server.SessionManager;
import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.server.handler.ContextHandlerCollection;
@@ -407,7 +408,21 @@ public class JettyHTTPServerEngine
if (sessionManager == null) {
sessionManager = new HashSessionManager();
HashSessionIdManager idManager = new HashSessionIdManager();
- sessionManager.setIdManager(idManager);
+
+ 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);
+ }
+ }
}
SessionHandler sessionHandler = new SessionHandler(sessionManager);
if (securityHandler != null) {
