Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2015-11-05 02:40:48 -0500
committerGreg Wilkins2015-11-05 02:40:48 -0500
commitde137abcc7802e93fc61f6db25ffec775fd870b5 (patch)
tree283f8514a4edc66f312376afa02941a270574ef6
parentfc9f42e11a0c2137fe82fb0fb9b9bdf2308a7d22 (diff)
parent9e19a95d1419a9f6b2e583f0b6f1245d6643d6cf (diff)
downloadorg.eclipse.jetty.project-de137abcc7802e93fc61f6db25ffec775fd870b5.tar.gz
org.eclipse.jetty.project-de137abcc7802e93fc61f6db25ffec775fd870b5.tar.xz
org.eclipse.jetty.project-de137abcc7802e93fc61f6db25ffec775fd870b5.zip
Merge remote-tracking branch 'origin/jetty-9.3.x'
-rw-r--r--examples/embedded/src/main/java/org/eclipse/jetty/embedded/Http2Server.java4
-rw-r--r--jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java3
-rw-r--r--tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/Dump.java2
3 files changed, 6 insertions, 3 deletions
diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/Http2Server.java b/examples/embedded/src/main/java/org/eclipse/jetty/embedded/Http2Server.java
index 8d984bf2d1..8e19c0a20e 100644
--- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/Http2Server.java
+++ b/examples/embedded/src/main/java/org/eclipse/jetty/embedded/Http2Server.java
@@ -55,6 +55,7 @@ import org.eclipse.jetty.server.SslConnectionFactory;
import org.eclipse.jetty.servlet.DefaultServlet;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.servlets.PushCacheFilter;
import org.eclipse.jetty.servlets.PushSessionCacheFilter;
import org.eclipse.jetty.util.ssl.SslContextFactory;
@@ -74,7 +75,8 @@ public class Http2Server
ServletContextHandler context = new ServletContextHandler(server, "/",ServletContextHandler.SESSIONS);
context.setResourceBase("src/main/resources/docroot");
- context.addFilter(PushSessionCacheFilter.class,"/*",EnumSet.of(DispatcherType.REQUEST));
+ context.addFilter(PushCacheFilter.class,"/*",EnumSet.of(DispatcherType.REQUEST));
+ // context.addFilter(PushSessionCacheFilter.class,"/*",EnumSet.of(DispatcherType.REQUEST));
context.addFilter(PushedTilesFilter.class,"/*",EnumSet.of(DispatcherType.REQUEST));
context.addServlet(new ServletHolder(servlet), "/test/*");
context.addServlet(DefaultServlet.class, "/").setInitParameter("maxCacheSize","81920");
diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
index f899d9809e..534d1076a1 100644
--- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
+++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
@@ -125,7 +125,8 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL
"org.eclipse.jetty.util.log.", // webapp should use server log
"org.eclipse.jetty.servlet.DefaultServlet", // webapp cannot change default servlets
"org.eclipse.jetty.jsp.JettyJspServlet", //webapp cannot change jetty jsp servlet
- "org.eclipse.jetty.servlets.PushCacheFilter" //must be loaded by container classpath
+ "org.eclipse.jetty.servlets.PushCacheFilter", //must be loaded by container classpath
+ "org.eclipse.jetty.servlets.PushSessionCacheFilter" //must be loaded by container classpath
} ;
// Server classes are classes that are hidden from being
diff --git a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/Dump.java b/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/Dump.java
index 6887c10b32..3a6b918239 100644
--- a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/Dump.java
+++ b/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/Dump.java
@@ -118,7 +118,7 @@ public class Dump extends HttpServlet
}
catch(ServletException se)
{
- se.printStackTrace();
+ getServletContext().log(se.toString());
}
}

Back to the top