Author: markt
Date: Fri Aug 16 12:51:45 2013
New Revision: 1514688
URL: http://svn.apache.org/r1514688
Log:
Fix unit test failures.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java?rev=1514688&r1=1514687&r2=1514688&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
Fri Aug 16 12:51:45 2013
@@ -536,9 +536,9 @@ public abstract class AbstractAjpProcess
@Override
public UpgradeInbound getUpgradeInbound() {
- // Should never reach this code but in case we do...
- throw new IllegalStateException(
- sm.getString("ajpprocessor.httpupgrade.notsupported"));
+ // Can't throw exception as this is used to test if connection has been
+ // upgraded using Tomcat's proprietary HTTP upgrade mechanism.
+ return null;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
