Author: markt
Date: Wed Oct 8 18:40:56 2014
New Revision: 1630194
URL: http://svn.apache.org/r1630194
Log:
Fix an i18n TODO
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings.properties?rev=1630194&r1=1630193&r2=1630194&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings.properties
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/server/LocalStrings.properties
Wed Oct 8 18:40:56 2014
@@ -24,6 +24,8 @@ serverContainer.servletContextMismatch=A
serverContainer.servletContextMissing=No ServletContext was specified
serverContainer.threadGroupNotDestroyed=Unable to destroy WebSocket thread
group [{0}] as [{1}] threads were still running when the web application was
stopped. The thread group will be destroyed once the threads terminate.
+upgradeUtil.incompatibleRsv=Extensions were specified that have incompatible
RSV bit usage
+
uriTemplate.duplicateParameter=The parameter [{0}] appears more than once in
the path which is not permitted
uriTemplate.emptySegment=The path [{0}] contains one or more empty segments
which are is not permitted
uriTemplate.invalidPath=The path [{0}] is not valid.
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/UpgradeUtil.java?rev=1630194&r1=1630193&r2=1630194&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/UpgradeUtil.java Wed
Oct 8 18:40:56 2014
@@ -37,6 +37,7 @@ import javax.websocket.HandshakeResponse
import javax.websocket.server.ServerEndpointConfig;
import org.apache.tomcat.util.codec.binary.Base64;
+import org.apache.tomcat.util.res.StringManager;
import org.apache.tomcat.util.security.ConcurrentMessageDigest;
import org.apache.tomcat.websocket.Constants;
import org.apache.tomcat.websocket.Transformation;
@@ -47,6 +48,8 @@ import org.apache.tomcat.websocket.pojo.
public class UpgradeUtil {
+ private static final StringManager sm =
+ StringManager.getManager(UpgradeUtil.class.getPackage().getName());
private static final byte[] WS_ACCEPT =
"258EAFA5-E914-47DA-95CA-C5AB0DC85B11".getBytes(
StandardCharsets.ISO_8859_1);
@@ -165,8 +168,7 @@ public class UpgradeUtil {
// Now we have the full pipeline, validate the use of the RSV bits.
if (transformation != null && !transformation.validateRsvBits(0)) {
- // TODO i18n
- throw new ServletException("Incompatible RSV bit usage");
+ throw new
ServletException(sm.getString("upgradeUtil.incompatibleRsv"));
}
// If we got this far, all is good. Accept the connection.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
