You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cs...@apache.org on 2016/12/09 14:47:24 UTC
activemq git commit: https://issues.apache.org/jira/browse/AMQ-6521
Repository: activemq
Updated Branches:
refs/heads/master 1a2e3eb0c -> 29b4db5c3
https://issues.apache.org/jira/browse/AMQ-6521
Fixing support for Jetty 9.3 and Jetty 9.2. The previous attempt at a
fix had the wrong class instance.
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/29b4db5c
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/29b4db5c
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/29b4db5c
Branch: refs/heads/master
Commit: 29b4db5c34fbb7087bc6a08f3e393da32b39ce66
Parents: 1a2e3eb
Author: Christopher L. Shannon (cshannon) <ch...@gmail.com>
Authored: Fri Dec 9 09:45:53 2016 -0500
Committer: Christopher L. Shannon (cshannon) <ch...@gmail.com>
Committed: Fri Dec 9 09:47:16 2016 -0500
----------------------------------------------------------------------
.../apache/activemq/transport/http/HttpTransportServer.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/29b4db5c/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpTransportServer.java
----------------------------------------------------------------------
diff --git a/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpTransportServer.java b/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpTransportServer.java
index f9774f3..ca3bed8 100644
--- a/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpTransportServer.java
+++ b/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpTransportServer.java
@@ -30,6 +30,7 @@ import org.eclipse.jetty.security.ConstraintSecurityHandler;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.handler.HandlerWrapper;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
@@ -124,13 +125,13 @@ public class HttpTransportServer extends WebTransportServerSupport {
}
private void addGzipHandler(ServletContextHandler contextHandler) throws Exception {
- Handler handler = null;
+ HandlerWrapper handler = null;
try {
- handler = (Handler) forName("org.eclipse.jetty.server.handler.GzipHandler").newInstance();
+ handler = (HandlerWrapper) forName("org.eclipse.jetty.servlets.gzip.GzipHandler").newInstance();
} catch (Throwable t) {
- handler = (Handler) forName("org.eclipse.jetty.servlets.gzip.GzipHandler").newInstance();
+ handler = (HandlerWrapper) forName("org.eclipse.jetty.server.handler.gzip.GzipHandler").newInstance();
}
- contextHandler.setHandler(handler);
+ contextHandler.insertHandler(handler);
}
private Class<?> forName(String name) throws ClassNotFoundException {