Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

410911 Continuation isExpired handling. 

refactored Servlet3Continuation to hold list of listeners and to be an AsyncListener itself and process onTimeout
This commit is contained in:
Greg Wilkins 2013-06-18 09:26:33 +10:00
parent be2cf578ce
commit 0162b616b5
1 changed files with 39 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
jetty-continuation/src/main/java/org/eclipse/jetty/continuation/Servlet3Continuation.java
View File

@ -37,7 +37,7 @@ import javax.servlet.ServletResponseWrapper;
* when it detects that the application has been deployed in a non-jetty Servlet 3
* server.
*/
public class Servlet3Continuation implements Continuation
public class Servlet3Continuation implements Continuation, AsyncListener
{
// Exception reused for all continuations
// Turn on debug in ContinuationFilter to see real stack trace.
@ -46,7 +46,7 @@ public class Servlet3Continuation implements Continuation
private final ServletRequest _request;
private ServletResponse _response;
private AsyncContext _context;
private final List<AsyncListener> _listeners=new ArrayList<AsyncListener>();
private final List<ContinuationListener> _listeners=new ArrayList<ContinuationListener>();
private volatile boolean _initial=true;
private volatile boolean _resumed=false;
private volatile boolean _expired=false;
@ -58,70 +58,13 @@ public class Servlet3Continuation implements Continuation
public Servlet3Continuation(ServletRequest request)
{
_request=request;
_listeners.add(new AsyncListener()
{
@Override
public void onComplete(AsyncEvent event) throws IOException
{
}
@Override
public void onError(AsyncEvent event) throws IOException
{
}
@Override
public void onStartAsync(AsyncEvent event) throws IOException
{
event.getAsyncContext().addListener(this);
}
@Override
public void onTimeout(AsyncEvent event) throws IOException
{
_initial=false;
event.getAsyncContext().dispatch();
}
});
}
/* ------------------------------------------------------------ */
@Override
public void addContinuationListener(final ContinuationListener listener)
{
AsyncListener wrapped = new AsyncListener()
{
@Override
public void onComplete(final AsyncEvent event) throws IOException
{
listener.onComplete(Servlet3Continuation.this);
}
@Override
public void onError(AsyncEvent event) throws IOException
{
listener.onComplete(Servlet3Continuation.this);
}
@Override
public void onStartAsync(AsyncEvent event) throws IOException
{
event.getAsyncContext().addListener(this);
}
@Override
public void onTimeout(AsyncEvent event) throws IOException
{
_expired=true;
listener.onTimeout(Servlet3Continuation.this);
}
};
if (_context!=null)
_context.addListener(wrapped);
else
_listeners.add(wrapped);
_listeners.add(listener);
}
/* ------------------------------------------------------------ */
@ -215,10 +158,7 @@ public class Servlet3Continuation implements Continuation
_expired=false;
_context=_request.startAsync();
_context.setTimeout(_timeoutMs);
for (AsyncListener listener:_listeners)
_context.addListener(listener);
_listeners.clear();
_context.addListener(this);
}
/* ------------------------------------------------------------ */
@ -229,10 +169,7 @@ public class Servlet3Continuation implements Continuation
_expired=false;
_context=_request.startAsync();
_context.setTimeout(_timeoutMs);
for (AsyncListener listener:_listeners)
_context.addListener(listener);
_listeners.clear();
_context.addListener(this);
}
/* ------------------------------------------------------------ */
@ -287,4 +224,38 @@ public class Servlet3Continuation implements Continuation
}
throw new IllegalStateException("!suspended");
}
/* ------------------------------------------------------------ */
@Override
public void onComplete(AsyncEvent event) throws IOException
{
for (ContinuationListener listener:_listeners)
listener.onComplete(this);
}
/* ------------------------------------------------------------ */
@Override
public void onError(AsyncEvent event) throws IOException
{
}
/* ------------------------------------------------------------ */
@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);
if (event.getSuppliedRequest().isAsyncStarted())
event.getAsyncContext().dispatch();
}
}