Author: markt
Date: Fri Apr 13 17:46:05 2018
New Revision: 1829091
URL: http://svn.apache.org/viewvc?rev=1829091&view=rev
Log:
Min Java 6. No StandardCharsets
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestOutputBuffer.java
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestOutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestOutputBuffer.java?rev=1829091&r1=1829090&r2=1829091&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestOutputBuffer.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestOutputBuffer.java
Fri Apr 13 17:46:05 2018
@@ -19,7 +19,6 @@ package org.apache.catalina.connector;
import java.io.BufferedWriter;
import java.io.IOException;
import java.io.Writer;
-import java.nio.charset.StandardCharsets;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
@@ -32,6 +31,7 @@ import org.junit.Test;
import org.apache.catalina.Context;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.buf.B2CConverter;
import org.apache.tomcat.util.buf.ByteChunk;
public class TestOutputBuffer extends TomcatBaseTest{
@@ -178,7 +178,7 @@ public class TestOutputBuffer extends To
ByteChunk bc = new ByteChunk();
getUrl("http://localhost:"; + getPort() + "/test", bc, null);
- bc.setCharset(StandardCharsets.UTF_8);
+ bc.setCharset(B2CConverter.UTF_8);
Assert.assertEquals(data, bc.toString());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
