[patch] new implementation of ByteChunk.toStringInternal()

patch.txt (text/plain), 1.75 KB, created by Keiichi Fujino on 2012-02-03 09:32:27 UTC

(hide)

Description: new implementation of ByteChunk.toStringInternal()

Filename:

MIME Type:

Creator: Keiichi Fujino

Created: 2012-02-03 09:32:27 UTC

Size: 1.75 KB

patch

obsolete

>Index: java/org/apache/tomcat/util/buf/ByteChunk.java >=================================================================== >--- java/org/apache/tomcat/util/buf/ByteChunk.java (revision 1206324) >+++ java/org/apache/tomcat/util/buf/ByteChunk.java (working copy) >@@ -23,6 +23,9 @@ > import java.nio.ByteBuffer; > import java.nio.CharBuffer; > import java.nio.charset.Charset; >+import java.nio.charset.CharsetDecoder; >+import java.nio.charset.CoderResult; >+import java.nio.charset.CodingErrorAction; > > /* > * In a server it is very important to be able to operate on >@@ -510,12 +513,20 @@ > if (charset == null) { > charset = DEFAULT_CHARSET; > } >- // new String(byte[], int, int, Charset) takes a defensive copy of the >- // entire byte array. This is expensive if only a small subset of the >- // bytes will be used. The code below is from Apache Harmony. >- CharBuffer cb; >- cb = charset.decode(ByteBuffer.wrap(buff, start, end-start)); >- return new String(cb.array(), cb.arrayOffset(), cb.length()); >+ CharsetDecoder dec = charset.newDecoder().onMalformedInput( >+ CodingErrorAction.REPLACE).onUnmappableCharacter( >+ CodingErrorAction.REPLACE); >+ char[] charAry = new char[(int) ((end - start) * dec.maxCharsPerByte())]; >+ >+ CharBuffer cbuff = CharBuffer.wrap(charAry); >+ CoderResult result; >+ >+ result = dec.decode(ByteBuffer.wrap(buff, start, end - start), cbuff, true); >+ if (!result.isUnderflow()) return new String(buff, start, end-start); >+ result = dec.flush(cbuff); >+ if (!result.isUnderflow()) return new String(buff, start, end-start); >+ >+ return new String(charAry, 0, cbuff.position()); > } > > public int getInt() View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]