Author: markt
Date: Thu Jan 19 15:13:16 2012
New Revision: 1233423
URL: http://svn.apache.org/viewvc?rev=1233423&view=rev
Log:
Take advantage of newly exposed Charset constants
Modified:
tomcat/trunk/java/org/apache/catalina/util/Base64.java
tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
tomcat/trunk/test/org/apache/tomcat/util/http/TesterParametersPerformance.java
Modified: tomcat/trunk/java/org/apache/catalina/util/Base64.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/Base64.java?rev=1233423&r1=1233422&r2=1233423&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/Base64.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/Base64.java Thu Jan 19 15:13:16
2012
@@ -17,8 +17,6 @@
package org.apache.catalina.util;
-import java.io.UnsupportedEncodingException;
-
import org.apache.tomcat.util.buf.B2CConverter;
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.buf.CharChunk;
@@ -172,15 +170,7 @@ public final class Base64
encodedData[encodedIndex + 3] = PAD;
}
- String result;
- try {
- result = new String(encodedData,
- B2CConverter.getCharset("ISO-8859-1"));
- } catch (UnsupportedEncodingException e) {
- // Should never happen but in case it does...
- result = new String(encodedData);
- }
- return result;
+ return new String(encodedData, B2CConverter.ISO_8859_1);
}
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java?rev=1233423&r1=1233422&r2=1233423&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java Thu Jan 19
15:13:16 2012
@@ -18,7 +18,6 @@ package org.apache.tomcat.util.buf;
import java.io.IOException;
import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
import java.nio.ByteBuffer;
import java.nio.CharBuffer;
import java.nio.charset.Charset;
@@ -100,17 +99,7 @@ public final class ByteChunk implements
as most standards seem to converge, but the servlet API requires
8859_1, and this object is used mostly for servlets.
*/
- public static final Charset DEFAULT_CHARSET;
-
- static {
- Charset c = null;
- try {
- c = B2CConverter.getCharset("ISO-8859-1");
- } catch (UnsupportedEncodingException e) {
- // Should never happen since all JVMs must support ISO-8859-1
- }
- DEFAULT_CHARSET = c;
- }
+ public static final Charset DEFAULT_CHARSET = B2CConverter.ISO_8859_1;
// byte[]
private byte[] buff;
Modified:
tomcat/trunk/test/org/apache/tomcat/util/http/TesterParametersPerformance.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/TesterParametersPerformance.java?rev=1233423&r1=1233422&r2=1233423&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/tomcat/util/http/TesterParametersPerformance.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/util/http/TesterParametersPerformance.java
Thu Jan 19 15:13:16 2012
@@ -109,13 +109,7 @@ public class TesterParametersPerformance
System.arraycopy(inputBytes, 0, bytes, 0, inputLength);
String[] result = new String[loops];
- Charset charset = null;
- try {
- charset = B2CConverter.getCharset("ISO-8859-1");
- } catch (UnsupportedEncodingException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ Charset charset = B2CConverter.ISO_8859_1;
long start = System.nanoTime();
for (int i = 0; i < loops; i++) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
