svn commit: r1707621 - in /tomcat/trunk/java/org/apache/coyote: AbstractProcessor.java Processor.java

[markt]

Author: markt
Date: Thu Oct  8 21:15:20 2015
New Revision: 1707621

URL: http://svn.apache.org/viewvc?rev=1707621&view=rev
Log:
No point in having abstract methods in an abstract class that are defined in an 
implemented interface.

Modified:
    tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
    tomcat/trunk/java/org/apache/coyote/Processor.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=1707621&r1=1707620&r2=1707621&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java Thu Oct  8 
21:15:20 2015
@@ -21,7 +21,6 @@ import java.io.InterruptedIOException;
 import java.util.concurrent.Executor;
 
 import javax.servlet.RequestDispatcher;
-import javax.servlet.http.HttpUpgradeHandler;
 
 import org.apache.juli.logging.Log;
 import org.apache.tomcat.util.ExceptionUtils;
@@ -193,16 +192,6 @@ public abstract class AbstractProcessor
         getAdapter().errorDispatch(request, response);
     }
 
-    @Override
-    public abstract boolean isUpgrade();
-
-    /**
-     * Process HTTP requests. All requests are treated as HTTP requests to 
start
-     * with although they may change type during processing.
-     */
-    @Override
-    public abstract SocketState process(SocketWrapperBase<?> socket) throws 
IOException;
-
 
     /**
      * Process an in-progress request that is not longer in standard HTTP mode.
@@ -287,8 +276,5 @@ public abstract class AbstractProcessor
      */
     protected abstract SocketState dispatchEndRequest();
 
-    @Override
-    public abstract HttpUpgradeHandler getHttpUpgradeHandler();
-
     protected abstract Log getLog();
 }

Modified: tomcat/trunk/java/org/apache/coyote/Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Processor.java?rev=1707621&r1=1707620&r2=1707621&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Processor.java Thu Oct  8 21:15:20 2015
@@ -34,6 +34,18 @@ import org.apache.tomcat.util.net.Socket
 public interface Processor {
     Executor getExecutor();
 
+    /**
+     * Process HTTP requests. All requests are treated as HTTP requests to 
start
+     * with although they may change type during processing.
+     *
+     * @param socketWrapper The connection to process
+     *
+     * @return The state the caller should put the socket in when this method
+     *         returns
+     *
+     * @throws IOException If an I/O error occurs during the processing of the
+     *         request
+     */
     SocketState process(SocketWrapperBase<?> socketWrapper) throws IOException;
 
     SocketState dispatch(SocketStatus status);



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org