diff options
| author | Robert Gemmell <robbie@apache.org> | 2014-01-31 15:52:15 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2014-01-31 15:52:15 +0000 |
| commit | e39e8353b5321a8ddd9a19054e83822a7b629684 (patch) | |
| tree | 50b8c6513d4fec6a55e613bb44bf75b607df8332 /qpid/java/broker-plugins/management-http/src | |
| parent | f7e49d4b3d51aa3b9c1e57032f1ade212552dbac (diff) | |
| download | qpid-python-e39e8353b5321a8ddd9a19054e83822a7b629684.tar.gz | |
QPID-5527: Upgrade to Jetty 8
Applied patch from Emmanuel Bourg.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1563153 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-plugins/management-http/src')
| -rw-r--r-- | qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java index 039114056f..3375a784ea 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java +++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java @@ -29,6 +29,7 @@ import javax.net.ssl.KeyManager; import javax.net.ssl.SSLContext; import javax.net.ssl.TrustManager; import javax.net.ssl.X509TrustManager; +import javax.servlet.DispatcherType; import org.apache.log4j.Logger; import org.apache.qpid.server.configuration.IllegalConfigurationException; @@ -77,7 +78,6 @@ import org.apache.qpid.server.plugin.PluginFactory; import org.apache.qpid.server.util.MapValueConverter; import org.apache.qpid.transport.network.security.ssl.QpidMultipleTrustManager; import org.eclipse.jetty.server.Connector; -import org.eclipse.jetty.server.DispatcherType; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.SessionManager; import org.eclipse.jetty.server.nio.SelectChannelConnector; @@ -396,7 +396,7 @@ public class HttpManagement extends AbstractPluginAdapter implements HttpManagem root.addServlet(new ServletHolder(new LogFileServlet()), "/rest/logfile"); final SessionManager sessionManager = root.getSessionHandler().getSessionManager(); - sessionManager.setSessionCookie(JSESSIONID_COOKIE_PREFIX + lastPort); + sessionManager.getSessionCookieConfig().setName(JSESSIONID_COOKIE_PREFIX + lastPort); sessionManager.setMaxInactiveInterval((Integer)getAttribute(TIME_OUT)); return server; |