Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2015-09-10 22:06:23 -0400
committerGreg Wilkins2015-09-10 22:06:23 -0400
commit02c5ea30be86112f351cf3d4ad93977479101a2e (patch)
treea9e528fc31e10ff78f38afd9b38f308396a46d55 /jetty-servlet
parent7957ed06efd765943701d6c1c6c6496734df3470 (diff)
downloadorg.eclipse.jetty.project-02c5ea30be86112f351cf3d4ad93977479101a2e.tar.gz
org.eclipse.jetty.project-02c5ea30be86112f351cf3d4ad93977479101a2e.tar.xz
org.eclipse.jetty.project-02c5ea30be86112f351cf3d4ad93977479101a2e.zip
477123 - AsyncListener callbacks need context scope
Also added DebugListener and deprecated DebugHandler
Diffstat (limited to 'jetty-servlet')
-rw-r--r--jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncIOServletTest.java2
-rw-r--r--jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncServletIOTest.java2
-rw-r--r--jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncServletTest.java2
3 files changed, 5 insertions, 1 deletions
diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncIOServletTest.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncIOServletTest.java
index d1e0379b9c..034a26c1f8 100644
--- a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncIOServletTest.java
+++ b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncIOServletTest.java
@@ -87,7 +87,7 @@ public class AsyncIOServletTest
context.addEventListener(new ContextHandler.ContextScopeListener()
{
@Override
- public void enterScope(Context context, Request request)
+ public void enterScope(Context context, Request request, Object reason)
{
if (scope.get()!=null)
throw new IllegalStateException();
diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncServletIOTest.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncServletIOTest.java
index 0326d44a47..721e7914e2 100644
--- a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncServletIOTest.java
+++ b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncServletIOTest.java
@@ -50,6 +50,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.DebugListener;
import org.eclipse.jetty.server.HttpConfiguration;
import org.eclipse.jetty.server.HttpConnectionFactory;
import org.eclipse.jetty.server.Server;
@@ -83,6 +84,7 @@ public class AsyncServletIOTest
_server.setConnectors(new Connector[]{ _connector });
ServletContextHandler context = new ServletContextHandler();
context.setContextPath("/ctx");
+ context.addEventListener(new DebugListener());
_server.setHandler(context);
_servletHandler=context.getServletHandler();
diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncServletTest.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncServletTest.java
index 3c076af584..111c302266 100644
--- a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncServletTest.java
+++ b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncServletTest.java
@@ -44,6 +44,7 @@ import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.DebugListener;
import org.eclipse.jetty.server.QuietServletException;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.RequestLog;
@@ -101,6 +102,7 @@ public class AsyncServletTest
ServletContextHandler context = new ServletContextHandler(ServletContextHandler.NO_SESSIONS);
context.setContextPath("/ctx");
logHandler.setHandler(context);
+ context.addEventListener(new DebugListener());
_servletHandler=context.getServletHandler();
ServletHolder holder=new ServletHolder(_servlet);

Back to the top