Author: remy.maucherat(a)jboss.com
Date: 2013-09-24 13:35:22 -0400 (Tue, 24 Sep 2013)
New Revision: 2264
Modified:
branches/7.4.x/src/main/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
branches/7.4.x/src/main/java/org/jboss/web/WebsocketsMessages.java
Log:
Port patch fixing CCE when wrapping.
Modified:
branches/7.4.x/src/main/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
===================================================================
---
branches/7.4.x/src/main/java/org/apache/tomcat/websocket/server/UpgradeUtil.java 2013-09-24
13:00:09 UTC (rev 2263)
+++
branches/7.4.x/src/main/java/org/apache/tomcat/websocket/server/UpgradeUtil.java 2013-09-24
17:35:22 UTC (rev 2264)
@@ -16,6 +16,8 @@
*/
package org.apache.tomcat.websocket.server;
+import static org.jboss.web.WebsocketsMessages.MESSAGES;
+
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
@@ -181,11 +183,11 @@
}
if (inner instanceof RequestFacade) {
WsHttpUpgradeHandler wsHandler =
- ((RequestFacade) req).upgrade(WsHttpUpgradeHandler.class);
+ ((RequestFacade) inner).upgrade(WsHttpUpgradeHandler.class);
wsHandler.preInit(ep, sec, sc, wsRequest, subProtocol,
pathParams, req.isSecure());
} else {
- throw new ServletException("Upgrade failed");
+ throw new ServletException(MESSAGES.upgradeFailed());
}
}
Modified: branches/7.4.x/src/main/java/org/jboss/web/WebsocketsMessages.java
===================================================================
--- branches/7.4.x/src/main/java/org/jboss/web/WebsocketsMessages.java 2013-09-24 13:00:09
UTC (rev 2263)
+++ branches/7.4.x/src/main/java/org/jboss/web/WebsocketsMessages.java 2013-09-24 17:35:22
UTC (rev 2264)
@@ -293,4 +293,7 @@
@Message(id = 8585, value = "Failed to create configurator of type [%s] for POJO
of type [%s]")
String configuratorFailed(String configurator, String className);
+ @Message(id = 8586, value = "Upgrade failed")
+ String upgradeFailed();
+
}
Show replies by date