Author: rjung
Date: Sun Mar 10 11:28:42 2013
New Revision: 1454837
URL: http://svn.apache.org/r1454837
Log:
Fix unit test failing only for TC 7 (Java 6)
by excluding the Java for-internal-use-only
charset 'COMPOUND_TEXT'.
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/buf/TestB2CConverter.java
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/buf/TestB2CConverter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/buf/TestB2CConverter.java?rev=1454837&r1=1454836&r2=1454837&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/buf/TestB2CConverter.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/buf/TestB2CConverter.java
Sun Mar 10 11:28:42 2013
@@ -76,6 +76,13 @@ public class TestB2CConverter {
// Likely something used internally by the JRE
continue;
}
+ if (charset.name().equals("COMPOUND_TEXT")) {
+ // Java for-internal-use-only charset
+ // See:
+ // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6392670
+ // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6381697
+ continue;
+ }
try {
leftover = charset.newEncoder().maxBytesPerChar();
} catch (UnsupportedOperationException uoe) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
