Author: markt Date: Fri May 3 16:14:49 2013 New Revision: 1478858 URL: http://svn.apache.org/r1478858 Log: Remove unused code
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java tomcat/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java?rev=1478858&r1=1478857&r2=1478858&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java Fri May 3 16:14:49 2013 @@ -162,12 +162,8 @@ public abstract class AbstractInputBuffe protected int lastActiveFilter; - // ------------------------------------------------------------- TODO SERVLET 3.1 IN PROGRESS - public abstract boolean supportsNonBlocking(); - // ------------------------------------------------------------- Properties - /** * Add an input filter to the filter library. */ Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java?rev=1478858&r1=1478857&r2=1478858&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java Fri May 3 16:14:49 2013 @@ -104,13 +104,6 @@ public class InternalAprInputBuffer exte } - @Override - public boolean supportsNonBlocking() { - //TODO SERVLET 3.1 - return false; - } - - /** * Read the request line. This function is meant to be used during the * HTTP request header parsing. Do NOT attempt to read the request body @@ -631,8 +624,8 @@ public class InternalAprInputBuffer exte @Override protected int nbRead() throws IOException { - // TODO Auto-generated method stub - return 0; + // TODO + throw new UnsupportedOperationException("APR non-blocking read"); } Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java?rev=1478858&r1=1478857&r2=1478858&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java Fri May 3 16:14:49 2013 @@ -442,12 +442,6 @@ public class InternalInputBuffer extends } - @Override - public boolean supportsNonBlocking() { - //TODO SERVLET 3.1 - return false; - } - @Override public void recycle() { Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java?rev=1478858&r1=1478857&r2=1478858&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java Fri May 3 16:14:49 2013 @@ -159,12 +159,6 @@ public class InternalNioInputBuffer exte // --------------------------------------------------------- Public Methods @Override - public boolean supportsNonBlocking() { - return true; - } - - - @Override public int available() { int available = super.available(); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org