Author: markt
Date: Sat May 12 22:21:08 2012
New Revision: 1337708
URL: http://svn.apache.org/viewvc?rev=1337708&view=rev
Log:
kkolinko review of r1337643
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1337707
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/LocalStrings.properties?rev=1337708&r1=1337707&r2=1337708&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/LocalStrings.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/LocalStrings.properties
Sat May 12 22:21:08 2012
@@ -24,4 +24,6 @@ is.unknownOpCode=A frame with the unreco
message.bufferTooSmall=The buffer is not big enough to contain the message
currently being processed
+servlet.reqUpgradeFail=Unable to cast to the Tomcat internal request class in
order to complete HTTP upgrade
+
outbound.closed=The WebSocket connection has been closed
\ No newline at end of file
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java?rev=1337708&r1=1337707&r2=1337708&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java
Sat May 12 22:21:08 2012
@@ -36,6 +36,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.catalina.connector.RequestFacade;
import org.apache.catalina.util.Base64;
import org.apache.tomcat.util.buf.B2CConverter;
+import org.apache.tomcat.util.res.StringManager;
/**
* Provides the base implementation of a Servlet for processing WebSocket
@@ -48,6 +49,8 @@ public abstract class WebSocketServlet e
private static final byte[] WS_ACCEPT =
"258EAFA5-E914-47DA-95CA-C5AB0DC85B11".getBytes(
B2CConverter.ISO_8859_1);
+ private static final StringManager sm =
+ StringManager.getManager(Constants.Package);
private Queue<MessageDigest> sha1Helpers =
new ConcurrentLinkedQueue<MessageDigest>();
@@ -123,9 +126,10 @@ public abstract class WebSocketServlet e
inner = ((ServletRequestWrapper) inner).getRequest();
}
if (inner instanceof RequestFacade) {
- ((RequestFacade) req).doUpgrade(inbound);
+ ((RequestFacade) inner).doUpgrade(inbound);
} else {
- resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+ resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
+ sm.getString("servlet.reqUpgradeFail"));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
