tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1478857 - in /tomcat/trunk/java/org/apache/coyote/http11: AbstractHttp11Processor.java LocalStrings.properties
Date Fri, 03 May 2013 16:13:43 GMT
Author: markt
Date: Fri May  3 16:13:43 2013
New Revision: 1478857

URL: http://svn.apache.org/r1478857
Log:
Fix a TODO in passing

Modified:
    tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
    tomcat/trunk/java/org/apache/coyote/http11/LocalStrings.properties

Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1478857&r1=1478856&r2=1478857&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Fri May  3 16:13:43
2013
@@ -1637,9 +1637,8 @@ public abstract class AbstractHttp11Proc
     @Override
     public SocketState upgradeDispatch(SocketStatus status) throws IOException {
         // Should never reach this code but in case we do...
-        // TODO
-        throw new IOException(
-                sm.getString("TODO"));
+        throw new IllegalStateException(
+                sm.getString("http11Processor.upgrade"));
     }
 
 

Modified: tomcat/trunk/java/org/apache/coyote/http11/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/LocalStrings.properties?rev=1478857&r1=1478856&r2=1478857&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/LocalStrings.properties Fri May  3 16:13:43
2013
@@ -24,6 +24,7 @@ http11processor.socket.ssl=Exception get
 http11processor.socket.sslreneg=Exception re-negotiating SSL connection
 http11processor.comet.notsupported=The Comet protocol is not supported by this connector
 http11processor.sendfile.error=Error sending data using sendfile. May be caused by invalid
request attributes for start/end points
+http11Processor.upgrade=An internal error has occurred as upgraded connections should only
be processed by the dedicated upgrade processor implementations
 
 iib.eof.error=Unexpected EOF read on the socket
 iib.invalidheader=The HTTP header line [{0}] does not conform to RFC 2616 and has been ignored.



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


Mime
View raw message