You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2013/01/25 13:20:08 UTC

svn commit: r1438466 - in /tomcat/trunk/java/org/apache/tomcat/websocket: LocalStrings.properties WsRemoteEndpointBase.java

Author: markt
Date: Fri Jan 25 12:20:08 2013
New Revision: 1438466

URL: http://svn.apache.org/viewvc?rev=1438466&view=rev
Log:
Fix an i18n TODO

Modified:
    tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
    tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java

Modified: tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties?rev=1438466&r1=1438465&r2=1438466&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties Fri Jan 25 12:20:08 2013
@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+messageSendStateMachine.changeType=When sending a fragmented message, all fragments bust be of the same type
 messageSendStateMachine.closed=Message will not be sent because the WebSocket session has been closed
 messageSendStateMachine.inProgress=Message will not be sent because the WebSocket session is currently sending another message
 

Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java?rev=1438466&r1=1438465&r2=1438466&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java Fri Jan 25 12:20:08 2013
@@ -457,8 +457,8 @@ public abstract class WsRemoteEndpointBa
             if (fragmented) {
                 // Currently fragmented
                 if (text != isText) {
-                    // TODO i18n
-                    throw new IllegalStateException();
+                    throw new IllegalStateException(
+                            sm.getString("messageSendStateMachine.changeType"));
                 }
                 nextText = text;
                 nextFragmented = !isLast;



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