svn commit: r1545622 - /tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java

[markt]

Author: markt
Date: Tue Nov 26 11:45:25 2013
New Revision: 1545622

URL: http://svn.apache.org/r1545622
Log:
Remove use of Java 7 class

Modified:
    
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java

Modified: 
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java?rev=1545622&r1=1545621&r2=1545622&view=diff
==============================================================================
--- 
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java 
Tue Nov 26 11:45:25 2013
@@ -20,7 +20,6 @@ import java.io.OutputStream;
 import java.io.Writer;
 import java.net.URI;
 import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
@@ -40,6 +39,7 @@ import org.apache.catalina.deploy.Applic
 import org.apache.catalina.servlets.DefaultServlet;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.buf.B2CConverter;
 import org.apache.tomcat.websocket.TesterMessageCountClient.AsyncBinary;
 import org.apache.tomcat.websocket.TesterMessageCountClient.AsyncHandler;
 import org.apache.tomcat.websocket.TesterMessageCountClient.AsyncText;
@@ -134,7 +134,7 @@ public class TestWsRemoteEndpoint extend
             OutputStream s = wsSession.getBasicRemote().getSendStream();
 
             for (int i = 0; i < 8; i++) {
-                s.write(TEST_MESSAGE_5K.getBytes(StandardCharsets.UTF_8));
+                s.write(TEST_MESSAGE_5K.getBytes(B2CConverter.UTF_8));
             }
 
             s.close();
@@ -158,7 +158,7 @@ public class TestWsRemoteEndpoint extend
             for (ByteBuffer message : messages) {
                 byte[] bytes = new byte[message.limit()];
                 message.get(bytes);
-                results.add(new String(bytes, StandardCharsets.UTF_8));
+                results.add(new String(bytes, B2CConverter.UTF_8));
             }
         }
 



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