From a2b1ceabc8b5c8061d2e30b827e00d9fa7e2e662 Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Mon, 4 Apr 2011 07:02:26 +0000 Subject: [PATCH] 339084 Fixed NPE with servlet 3.0 async listener git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2962 7e9141cc-0065-0410-87d8-b60c137991c4 --- VERSION.txt | 1 + .../org/eclipse/jetty/continuation/Servlet3Continuation.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/VERSION.txt b/VERSION.txt index 30fc0fc6fb8..4227f230c69 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -4,6 +4,7 @@ jetty-7.4.0-SNAPSHOT + 338627 HashSessionManager.getIdleSavePeriod returns milliseconds instead of seconds + 338807 Ignore content length in 1xx, 204, 304 responses + 338819 Externally control Deployment Manager application lifecycle + + 339084 Fixed NPE with servlet 3.0 async listener + 339150 Validate client certificate when it is used for authentication + 339187 In the OSGi manifest of the jetty-all-server aggregate, mark javax.annotation as optional + 339543 Add configuration options for Certificate Revocation checking diff --git a/jetty-continuation/src/main/java/org/eclipse/jetty/continuation/Servlet3Continuation.java b/jetty-continuation/src/main/java/org/eclipse/jetty/continuation/Servlet3Continuation.java index 3d15be2d0a2..e4bca0be202 100644 --- a/jetty-continuation/src/main/java/org/eclipse/jetty/continuation/Servlet3Continuation.java +++ b/jetty-continuation/src/main/java/org/eclipse/jetty/continuation/Servlet3Continuation.java @@ -91,7 +91,7 @@ public class Servlet3Continuation implements Continuation } }; - if (_context==null) + if (_context!=null) _context.addListener(wrapped); else _listeners.add(wrapped);