changeset 931:6f7e2ff51879

remove ContinuationThrowable
author Franklin Schmidt <fschmidt@gmail.com>
date Sun, 09 Oct 2016 19:24:55 -0600
parents cd080b7bcf49
children 947df3056ddb
files src/org/eclipse/jetty/continuation/ContinuationThrowable.java src/org/eclipse/jetty/server/AbstractHttpConnection.java src/org/eclipse/jetty/server/AsyncContinuation.java
diffstat 3 files changed, 1 insertions(+), 55 deletions(-) [+]
line wrap: on
line diff
diff -r cd080b7bcf49 -r 6f7e2ff51879 src/org/eclipse/jetty/continuation/ContinuationThrowable.java
--- a/src/org/eclipse/jetty/continuation/ContinuationThrowable.java	Sun Oct 09 19:20:52 2016 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-//
-//  ========================================================================
-//  Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd.
-//  ------------------------------------------------------------------------
-//  All rights reserved. This program and the accompanying materials
-//  are made available under the terms of the Eclipse Public License v1.0
-//  and Apache License v2.0 which accompanies this distribution.
-//
-//      The Eclipse Public License is available at
-//      http://www.eclipse.org/legal/epl-v10.html
-//
-//      The Apache License v2.0 is available at
-//      http://www.opensource.org/licenses/apache2.0.php
-//
-//  You may elect to redistribute this code under either of these licenses.
-//  ========================================================================
-//
-
-
-package org.eclipse.jetty.continuation;
-
-
-/* ------------------------------------------------------------ */
-/** ContinuationThrowable
- * <p>
- * A ContinuationThrowable is throw by {@link Continuation#undispatch()}
- * in order to exit the dispatch to a Filter or Servlet.  Use of
- * ContinuationThrowable is discouraged and it is preferable to 
- * allow return to be used. ContinuationThrowables should only be
- * used when there is a Filter/Servlet which cannot be modified
- * to avoid committing a response when {@link Continuation#isSuspended()}
- * is true.
- * </p>
- * <p>
- * ContinuationThrowable instances are often reused so that the
- * stack trace may be entirely unrelated to the calling stack.
- * A real stack trace may be obtained by enabling debug.
- * </p>
- * <p>
- * ContinuationThrowable extends Error as this is more likely
- * to be uncaught (or rethrown) by a Filter/Servlet.  A ContinuationThrowable
- * does not represent and error condition.
- * </p>
- */
-public class ContinuationThrowable extends Error
-{}
diff -r cd080b7bcf49 -r 6f7e2ff51879 src/org/eclipse/jetty/server/AbstractHttpConnection.java
--- a/src/org/eclipse/jetty/server/AbstractHttpConnection.java	Sun Oct 09 19:20:52 2016 -0600
+++ b/src/org/eclipse/jetty/server/AbstractHttpConnection.java	Sun Oct 09 19:24:55 2016 -0600
@@ -29,7 +29,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.eclipse.jetty.continuation.ContinuationThrowable;
 import org.eclipse.jetty.http.EncodedHttpURI;
 import org.eclipse.jetty.http.Generator;
 import org.eclipse.jetty.http.HttpBuffers;
@@ -458,10 +457,6 @@
 					_connector.customize(_endp, _request);
 					server.handle(this);
 				}
-				catch (ContinuationThrowable e)
-				{
-					LOG.trace("",e);
-				}
 				catch (EofException e)
 				{
 					async_exception=e;
diff -r cd080b7bcf49 -r 6f7e2ff51879 src/org/eclipse/jetty/server/AsyncContinuation.java
--- a/src/org/eclipse/jetty/server/AsyncContinuation.java	Sun Oct 09 19:20:52 2016 -0600
+++ b/src/org/eclipse/jetty/server/AsyncContinuation.java	Sun Oct 09 19:24:55 2016 -0600
@@ -33,7 +33,6 @@
 import javax.servlet.http.HttpServletRequest;
 
 import org.eclipse.jetty.continuation.Continuation;
-import org.eclipse.jetty.continuation.ContinuationThrowable;
 import org.eclipse.jetty.continuation.ContinuationListener;
 import org.eclipse.jetty.io.AsyncEndPoint;
 import org.eclipse.jetty.io.EndPoint;
@@ -53,9 +52,7 @@
 	private static final Logger LOG = LoggerFactory.getLogger(AsyncContinuation.class);
 
 	private final static long DEFAULT_TIMEOUT=30000L;
-	
-	private final static ContinuationThrowable __exception = new ContinuationThrowable();
-	
+		
 	// STATES:
 	//               handling()    suspend()     unhandle()    resume()       complete()  doComplete()
 	//                             startAsync()                dispatch()