svn commit: r1725299 - in /tomcat/trunk/java/org/apache/coyote: AbstractProtocol.java ajp/AbstractAjpProtocol.java http11/AbstractHttp11Protocol.java

[markt]

Author: markt
Date: Mon Jan 18 16:07:08 2016
New Revision: 1725299

URL: http://svn.apache.org/viewvc?rev=1725299&view=rev
Log:
Minor clean-up. Remove an unnecessary declared exception

Modified:
    tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
    tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
    tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java

Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1725299&r1=1725298&r2=1725299&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Mon Jan 18 
16:07:08 2016
@@ -16,7 +16,6 @@
  */
 package org.apache.coyote;
 
-import java.io.IOException;
 import java.net.InetAddress;
 import java.nio.ByteBuffer;
 import java.util.Collections;
@@ -434,7 +433,7 @@ public abstract class AbstractProtocol<S
 
     protected abstract Processor createUpgradeProcessor(
             SocketWrapperBase<?> socket, ByteBuffer leftoverInput,
-            UpgradeToken upgradeToken) throws IOException;
+            UpgradeToken upgradeToken);
 
 
     // ----------------------------------------------------- JMX related 
methods

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java?rev=1725299&r1=1725298&r2=1725299&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java Mon Jan 18 
16:07:08 2016
@@ -16,7 +16,6 @@
  */
 package org.apache.coyote.ajp;
 
-import java.io.IOException;
 import java.nio.ByteBuffer;
 
 import org.apache.coyote.AbstractProtocol;
@@ -172,8 +171,8 @@ public abstract class AbstractAjpProtoco
 
     @Override
     protected Processor createUpgradeProcessor(SocketWrapperBase<?> socket,
-            ByteBuffer leftoverInput, UpgradeToken upgradeToken) throws 
IOException {
-        throw new IOException(sm.getString("ajpprotocol.noUpgradeHandler",
+            ByteBuffer leftoverInput, UpgradeToken upgradeToken) {
+        throw new 
IllegalStateException(sm.getString("ajpprotocol.noUpgradeHandler",
                 upgradeToken.getHttpUpgradeHandler().getClass().getName()));
     }
 }

Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1725299&r1=1725298&r2=1725299&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Mon 
Jan 18 16:07:08 2016
@@ -16,7 +16,6 @@
  */
 package org.apache.coyote.http11;
 
-import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -645,8 +644,7 @@ public abstract class AbstractHttp11Prot
     @Override
     protected Processor createUpgradeProcessor(
             SocketWrapperBase<?> socket, ByteBuffer leftoverInput,
-            UpgradeToken upgradeToken)
-            throws IOException {
+            UpgradeToken upgradeToken) {
         HttpUpgradeHandler httpUpgradeHandler = 
upgradeToken.getHttpUpgradeHandler();
         if (httpUpgradeHandler instanceof InternalHttpUpgradeHandler) {
             return new UpgradeProcessorInternal(socket, leftoverInput, 
upgradeToken);



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