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

[markt]

Author: markt
Date: Tue Jun 11 20:42:33 2013
New Revision: 1491948

URL: http://svn.apache.org/r1491948
Log:
No need to use fully-qualified name now that it has been renamed from 
ProtocolHandler (that clashed with an internal Tomcat class)

Modified:
    tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
    tomcat/trunk/java/org/apache/coyote/AbstractProtocol.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=1491948&r1=1491947&r2=1491948&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java Tue Jun 11 
20:42:33 2013
@@ -19,6 +19,8 @@ package org.apache.coyote;
 import java.io.IOException;
 import java.util.concurrent.Executor;
 
+import javax.servlet.http.HttpUpgradeHandler;
+
 import org.apache.tomcat.util.net.AbstractEndpoint;
 import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
 import org.apache.tomcat.util.net.SocketStatus;
@@ -153,5 +155,5 @@ public abstract class AbstractProcessor<
             throws IOException;
 
     @Override
-    public abstract javax.servlet.http.HttpUpgradeHandler 
getHttpUpgradeHandler();
+    public abstract HttpUpgradeHandler getHttpUpgradeHandler();
 }

Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1491948&r1=1491947&r2=1491948&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Tue Jun 11 
20:42:33 2013
@@ -29,6 +29,7 @@ import javax.management.MBeanRegistratio
 import javax.management.MBeanServer;
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
+import javax.servlet.http.HttpUpgradeHandler;
 
 import org.apache.juli.logging.Log;
 import org.apache.tomcat.util.ExceptionUtils;
@@ -631,7 +632,7 @@ public abstract class AbstractProtocol i
 
                     if (state == SocketState.UPGRADING) {
                         // Get the HTTP upgrade handler
-                        javax.servlet.http.HttpUpgradeHandler 
httpUpgradeHandler =
+                        HttpUpgradeHandler httpUpgradeHandler =
                                 processor.getHttpUpgradeHandler();
                         // Release the Http11 processor to be re-used
                         release(wrapper, processor, false, false);
@@ -727,8 +728,7 @@ public abstract class AbstractProtocol i
                 boolean addToPoller);
         protected abstract Processor<S> createUpgradeProcessor(
                 SocketWrapper<S> socket,
-                javax.servlet.http.HttpUpgradeHandler httpUpgradeProcessor)
-                        throws IOException;
+                HttpUpgradeHandler httpUpgradeProcessor) throws IOException;
 
         protected void register(AbstractProcessor<S> processor) {
             if (getProtocol().getDomain() != null) {

Modified: tomcat/trunk/java/org/apache/coyote/Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Processor.java?rev=1491948&r1=1491947&r2=1491948&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Processor.java Tue Jun 11 20:42:33 2013
@@ -19,6 +19,8 @@ package org.apache.coyote;
 import java.io.IOException;
 import java.util.concurrent.Executor;
 
+import javax.servlet.http.HttpUpgradeHandler;
+
 import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
 import org.apache.tomcat.util.net.SSLSupport;
 import org.apache.tomcat.util.net.SocketStatus;
@@ -38,7 +40,7 @@ public interface Processor<S> {
     SocketState asyncDispatch(SocketStatus status);
     SocketState asyncPostProcess();
 
-    javax.servlet.http.HttpUpgradeHandler getHttpUpgradeHandler();
+    HttpUpgradeHandler getHttpUpgradeHandler();
     SocketState upgradeDispatch(SocketStatus status) throws IOException;
 
     boolean isComet();



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