Repository: activemq Updated Branches: refs/heads/activemq-5.14.x d3c5e8188 -> 80b5fdcf2
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. (cherry picked from commit 29b4db5c34fbb7087bc6a08f3e393da32b39ce66) Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/80b5fdcf Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/80b5fdcf Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/80b5fdcf Branch: refs/heads/activemq-5.14.x Commit: 80b5fdcf2ff48f4ac55cabd86addc0267478573e Parents: d3c5e81 Author: Christopher L. Shannon (cshannon) <[email protected]> Authored: Fri Dec 9 09:45:53 2016 -0500 Committer: Christopher L. Shannon (cshannon) <[email protected]> Committed: Fri Dec 9 09:47:59 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/80b5fdcf/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 100755 --- 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 {
