Author: kkolinko
Date: Fri Dec 11 19:47:43 2015
New Revision: 1719509
URL: http://svn.apache.org/viewvc?rev=1719509&view=rev
Log:
Fix compilation failure in tests when Java 6 + Java 7 is used
when configured as JAVA_HOME=Java6 in system properties, java.7.home=Java7 in
build.properties file
(I did not note this failure, as I was running the tests with a more simple
configuration,
JAVA_HOME=Java7 and no java.7.home setting)
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TesterWsCloseClient.java
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TesterWsCloseClient.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TesterWsCloseClient.java?rev=1719509&r1=1719508&r2=1719509&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TesterWsCloseClient.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TesterWsCloseClient.java
Fri Dec 11 19:47:43 2015
@@ -20,10 +20,11 @@ import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.net.Socket;
-import java.nio.charset.StandardCharsets;
import javax.websocket.CloseReason.CloseCode;
+import org.apache.tomcat.util.buf.B2CConverter;
+
/**
* A client for testing Websocket behavior that differs from standard client
* behavior.
@@ -47,12 +48,12 @@ public class TesterWsCloseClient {
public void httpUpgrade(String path) throws IOException {
String req = createUpgradeRequest(path);
- write(req.getBytes(StandardCharsets.UTF_8));
+ write(req.getBytes(B2CConverter.UTF_8));
readUpgradeResponse();
}
public void sendMessage(String text) throws IOException {
- write(createFrame(true, 1, text.getBytes(StandardCharsets.UTF_8)));
+ write(createFrame(true, 1, text.getBytes(B2CConverter.UTF_8)));
}
public void sendCloseFrame(CloseCode closeCode) throws IOException {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
