Merge remote-tracking branch 'origin/master' into servlet-3.1-api

Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java

2 files changed, 12 insertions, 1 deletions

diff --git a/jetty-continuation/pom.xml b/jetty-continuation/pom.xml
index 488720a066..4683f8b89c 100644
--- a/jetty-continuation/pom.xml
+++ b/jetty-continuation/pom.xml
@@ -8,6 +8,7 @@
   <artifactId>jetty-continuation</artifactId>
   <name>Jetty :: Continuation</name>
   <description>Asynchronous API</description>
+  <url>http://www.eclipse.org/jetty</url>
   <properties>
     <bundle-symbolic-name>${project.groupId}.continuation</bundle-symbolic-name>
   </properties>
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 2abb8412fe..4bb548a3a1 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
@@ -166,7 +166,17 @@ public class Servlet3Continuation implements Continuation
     @Override
     public boolean isSuspended()
     {
-        return _request.isAsyncStarted();
+        if (_request.isAsyncStarted())
+            return true;
+        try
+        {
+            return _request.getAsyncContext()!=null;
+        }
+        catch(IllegalStateException e)
+        {
+            // ignored
+        }
+        return false;
     }
 
     /* ------------------------------------------------------------ */