Author: kkolinko Date: Thu Sep 25 11:23:40 2014 New Revision: 1627515 URL: http://svn.apache.org/r1627515 Log: Backport of 1627323 when reviewing r1627476: In CoyoteAdapter.asyncDispatch(): The local variable "success" has initial value of "true". Simplify code: there is no need to set it to true explicitly.
Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1627323 Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1627515&r1=1627514&r2=1627515&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Thu Sep 25 11:23:40 2014 @@ -289,7 +289,6 @@ public class CoyoteAdapter implements Ad } if (status==SocketStatus.TIMEOUT) { - success = true; if (!asyncConImpl.timeout()) { asyncConImpl.setErrorState(null, false); } @@ -303,7 +302,6 @@ public class CoyoteAdapter implements Ad } if (request.isAsyncDispatching()) { - success = true; connector.getService().getContainer().getPipeline().getFirst().invoke(request, response); Throwable t = (Throwable) request.getAttribute( RequestDispatcher.ERROR_EXCEPTION); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org