Author: markt Date: Mon Apr 29 20:41:42 2013 New Revision: 1477333 URL: http://svn.apache.org/r1477333 Log: Remove unused code. Ensure WriteListener is recycled.
Modified: tomcat/trunk/java/org/apache/coyote/Request.java tomcat/trunk/java/org/apache/coyote/Response.java Modified: tomcat/trunk/java/org/apache/coyote/Request.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Request.java?rev=1477333&r1=1477332&r2=1477333&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/Request.java (original) +++ tomcat/trunk/java/org/apache/coyote/Request.java Mon Apr 29 20:41:42 2013 @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.Atomi import javax.servlet.ReadListener; -import org.apache.coyote.http11.AbstractInputBuffer; import org.apache.tomcat.util.buf.ByteChunk; import org.apache.tomcat.util.buf.MessageBytes; import org.apache.tomcat.util.buf.UDecoder; @@ -166,21 +165,8 @@ public final class Request { } this.listener = listener; - setBlocking(false); } - protected volatile boolean blocking = true; - - public boolean isBlocking() { - return blocking; - } - - public void setBlocking(boolean blocking) throws IllegalStateException { - @SuppressWarnings("rawtypes") - AbstractInputBuffer buf = (AbstractInputBuffer)inputBuffer; - if (!blocking && !buf.supportsNonBlocking()) throw new IllegalStateException(); - this.blocking = blocking; - } // ------------------------------------------------------------- Properties @@ -551,7 +537,6 @@ public final class Request { authType.recycle(); attributes.clear(); - blocking = true; listener = null; startTime = -1; Modified: tomcat/trunk/java/org/apache/coyote/Response.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Response.java?rev=1477333&r1=1477332&r2=1477333&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/Response.java (original) +++ tomcat/trunk/java/org/apache/coyote/Response.java Mon Apr 29 20:41:42 2013 @@ -23,7 +23,6 @@ import java.util.concurrent.atomic.Atomi import javax.servlet.WriteListener; -import org.apache.coyote.http11.AbstractOutputBuffer; import org.apache.tomcat.util.buf.ByteChunk; import org.apache.tomcat.util.http.MimeHeaders; import org.apache.tomcat.util.http.parser.HttpParser; @@ -525,6 +524,7 @@ public final class Response { commited = false; errorException = null; headers.clear(); + listener = null; // update counters contentWritten=0; @@ -574,20 +574,6 @@ public final class Response { this.listener = listener; action(ActionCode.SET_WRITE_LISTENER, null); - setBlocking(false); this.listener = listener; } - - protected volatile boolean blocking = true; - - public boolean isBlocking() { - return blocking; - } - - public void setBlocking(boolean blocking) throws IllegalStateException { - @SuppressWarnings("rawtypes") - AbstractOutputBuffer buf = (AbstractOutputBuffer)outputBuffer; - if (!blocking && !buf.supportsNonBlocking()) throw new IllegalStateException(); - this.blocking = blocking; - } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org