From 738f61d0ebd263c92db406f415fede8e8117f923 Mon Sep 17 00:00:00 2001
From: Greg Wilkins <gregw@webtide.com>
Date: Sat, 16 Apr 2016 09:55:16 +1000
Subject: [PATCH] Issue #501 clear continuation initial on undispatch

---
 .../org/eclipse/jetty/continuation/Servlet3Continuation.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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 41f230891e8..1b6c8b7a1dc 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
@@ -218,6 +218,7 @@ public class Servlet3Continuation implements Continuation, AsyncListener
     {
         if (isSuspended())
         {
+            _initial=false;
             if (ContinuationFilter.__debug)
                 throw new ContinuationThrowable();
             throw __exception;
@@ -244,14 +245,12 @@ public class Servlet3Continuation implements Continuation, AsyncListener
     @Override
     public void onStartAsync(AsyncEvent event) throws IOException
     {
-        _initial=false;
     }
 
     /* ------------------------------------------------------------ */
     @Override
     public void onTimeout(AsyncEvent event) throws IOException
     {
-        _initial=false;
         _expired=true;
         for (ContinuationListener listener:_listeners)
             listener.onTimeout(this);