Author: markt Date: Wed Oct 29 12:24:42 2014 New Revision: 1635110 URL: http://svn.apache.org/r1635110 Log: AsyncStateMachine doesn't need to know what type of socket the Processor is associated with.
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java Modified: tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java?rev=1635110&r1=1635109&r2=1635110&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java (original) +++ tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java Wed Oct 29 12:24:42 2014 @@ -37,7 +37,7 @@ public abstract class AbstractProcessor< protected static final StringManager sm = StringManager.getManager(Constants.Package); protected Adapter adapter; - protected final AsyncStateMachine<S> asyncStateMachine; + protected final AsyncStateMachine asyncStateMachine; protected final AbstractEndpoint<S> endpoint; protected final Request request; protected final Response response; @@ -62,7 +62,7 @@ public abstract class AbstractProcessor< public AbstractProcessor(AbstractEndpoint<S> endpoint) { this.endpoint = endpoint; - asyncStateMachine = new AsyncStateMachine<>(this); + asyncStateMachine = new AsyncStateMachine(this); request = new Request(); response = new Response(); response.setHook(this); Modified: tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java?rev=1635110&r1=1635109&r2=1635110&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java [UTF-8] (original) +++ tomcat/trunk/java/org/apache/coyote/AsyncStateMachine.java [UTF-8] Wed Oct 29 12:24:42 2014 @@ -97,7 +97,7 @@ import org.apache.tomcat.util.security.P * |----------------------------------------------------------------------------| * </pre> */ -public class AsyncStateMachine<S> { +public class AsyncStateMachine { /** * The string manager for this package. @@ -145,10 +145,10 @@ public class AsyncStateMachine<S> { private volatile AsyncState state = AsyncState.DISPATCHED; // Need this to fire listener on complete private AsyncContextCallback asyncCtxt = null; - private final Processor<S> processor; + private final Processor<?> processor; - public AsyncStateMachine(Processor<S> processor) { + public AsyncStateMachine(Processor<?> processor) { this.processor = processor; } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org