Author: violetagg
Date: Fri Oct 28 06:58:33 2016
New Revision: 1766930
URL: http://svn.apache.org/viewvc?rev=1766930&view=rev
Log:
o.a.catalina.connector.OutputBuffer is now using ByteBuffer/CharBuffer instead
of ByteChunk/CharChunk.
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 28 06:58:33 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758423,1758425-1758427,1758430,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1760005,1760022,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762123,1762168,1762172,1762182,1762202,1762288,1762296,1762348,1762353,1762374,1762503,1762505,1762541,1762608,1762710,1762753,1762766,176276
9,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763512,1763516,1763518,1763520,1763529,1763574,1763634-1763635,1763718,1763786,1763798-1763799,1764083,1764425,1764646,1764648-1764649,1764659,1764663,1764682,1764862,1764866-1764867,1764870,1764897,1765133,1765299,1765358,1765439,1765447,1765495,1765502,1765569-1765571,1765579,1765582,1765589-1765590,1765794,1765801,1765813,1765815,1766276,1766514,1766533,1766535,1766664,1766675,1766698
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1760005,1760022,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762123,1762168,1762172,1762182,1762202,1762288,1762296,1762348,1762353,1762374,1762503,1762505,1762541,1762608,1762710,1762753,176276
6,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763512,1763516,1763518,1763520,1763529,1763574,1763634-1763635,1763718,1763786,1763798-1763799,1764083,1764425,1764646,1764648-1764649,1764659,1764663,1764682,1764862,1764866-1764867,1764870,1764897,1765133,1765299,1765358,1765439,1765447,1765495,1765502,1765569-1765571,1765579,1765582,1765589-1765590,1765794,1765801,1765813,1765815,1766276,1766514,1766533,1766535,1766664,1766675,1766698
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java?rev=1766930&r1=1766929&r2=1766930&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java
Fri Oct 28 06:58:33 2016
@@ -18,7 +18,9 @@ package org.apache.catalina.connector;
import java.io.IOException;
import java.io.Writer;
+import java.nio.Buffer;
import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
import java.nio.charset.Charset;
import java.security.AccessController;
import java.security.PrivilegedActionException;
@@ -64,13 +66,13 @@ public class OutputBuffer extends Writer
/**
* The byte buffer.
*/
- private final ByteChunk bb;
+ private ByteBuffer bb;
/**
- * The chunk buffer.
+ * The char buffer.
*/
- private final CharChunk cb;
+ private final CharBuffer cb;
/**
@@ -104,18 +106,6 @@ public class OutputBuffer extends Writer
/**
- * Byte chunk used to output bytes.
- */
- private final ByteChunk outputChunk = new ByteChunk();
-
-
- /**
- * Char chunk used to output chars.
- */
- private CharChunk outputCharChunk = new CharChunk();
-
-
- /**
* Encoding to use.
*/
private String enc;
@@ -159,13 +149,10 @@ public class OutputBuffer extends Writer
*/
public OutputBuffer(int size) {
- bb = new ByteChunk(size);
- bb.setLimit(size);
- bb.setByteOutputChannel(this);
- cb = new CharChunk(size);
- cb.setLimit(size);
- cb.setOptimizedWrite(false);
- cb.setCharOutputChannel(this);
+ bb = ByteBuffer.allocate(size);
+ clear(bb);
+ cb = CharBuffer.allocate(size);
+ clear(cb);
}
@@ -224,9 +211,8 @@ public class OutputBuffer extends Writer
bytesWritten = 0;
charsWritten = 0;
- bb.recycle();
- cb.recycle();
- outputCharChunk.setChars(null, 0, 0);
+ clear(bb);
+ clear(cb);
closed = false;
suspended = false;
doFlush = false;
@@ -258,8 +244,8 @@ public class OutputBuffer extends Writer
// If there are chars, flush all of them to the byte buffer now as
bytes are used to
// calculate the content-length (if everything fits into the byte
buffer, of course).
- if (cb.getLength() > 0) {
- cb.flushBuffer();
+ if (cb.remaining() > 0) {
+ flushCharBuffer();
}
if ((!coyoteResponse.isCommitted()) &&
(coyoteResponse.getContentLengthLong() == -1)
@@ -270,7 +256,7 @@ public class OutputBuffer extends Writer
// setting a value of zero here will result in an explicit content
// length of zero being set on the response.
if (!coyoteResponse.isCommitted()) {
- coyoteResponse.setContentLength(bb.getLength());
+ coyoteResponse.setContentLength(bb.remaining());
}
}
@@ -320,11 +306,11 @@ public class OutputBuffer extends Writer
coyoteResponse.sendHeaders();
initial = false;
}
- if (cb.getLength() > 0) {
- cb.flushBuffer();
+ if (cb.remaining() > 0) {
+ flushCharBuffer();
}
- if (bb.getLength() > 0) {
- bb.flushBuffer();
+ if (bb.remaining() > 0) {
+ flushByteBuffer();
}
} finally {
doFlush = false;
@@ -367,12 +353,11 @@ public class OutputBuffer extends Writer
// If we really have something to write
if (cnt > 0) {
// real write to the adapter
- outputChunk.setBytes(buf, off, cnt);
try {
- coyoteResponse.doWrite(outputChunk);
+ coyoteResponse.doWrite(ByteBuffer.wrap(buf, off, cnt));
} catch (IOException e) {
// An IOException on a write is almost always due to
- // the remote client aborting the request. Wrap this
+ // the remote client aborting the request. Wrap this
// so that it can be handled better by the error dispatcher.
throw new ClientAbortException(e);
}
@@ -406,7 +391,7 @@ public class OutputBuffer extends Writer
coyoteResponse.doWrite(buf.slice());
} catch (IOException e) {
// An IOException on a write is almost always due to
- // the remote client aborting the request. Wrap this
+ // the remote client aborting the request. Wrap this
// so that it can be handled better by the error dispatcher.
throw new ClientAbortException(e);
}
@@ -443,13 +428,13 @@ public class OutputBuffer extends Writer
return;
}
- bb.append(b, off, len);
+ append(b, off, len);
bytesWritten += len;
// if called from within flush(), then immediately flush
// remaining bytes
if (doFlush) {
- bb.flushBuffer();
+ flushByteBuffer();
}
}
@@ -461,13 +446,13 @@ public class OutputBuffer extends Writer
return;
}
- bb.append(from);
+ append(from);
bytesWritten += from.remaining();
// if called from within flush(), then immediately flush
// remaining bytes
if (doFlush) {
- bb.flushBuffer();
+ flushByteBuffer();
}
}
@@ -479,7 +464,11 @@ public class OutputBuffer extends Writer
return;
}
- bb.append((byte) b);
+ if (isFull(bb)) {
+ flushByteBuffer();
+ }
+
+ transfer((byte) b, bb);
bytesWritten++;
}
@@ -500,20 +489,31 @@ public class OutputBuffer extends Writer
@Override
public void realWriteChars(char buf[], int off, int len) throws
IOException {
- outputCharChunk.setChars(buf, off, len);
- while (outputCharChunk.getLength() > 0) {
+ CharBuffer outputCharChunk = CharBuffer.wrap(buf, off, len);
+ while (outputCharChunk.remaining() > 0) {
conv.convert(outputCharChunk, bb);
- if (bb.getLength() == 0) {
+ if (bb.remaining() == 0) {
// Break out of the loop if more chars are needed to produce
any output
break;
}
- if (outputCharChunk.getLength() > 0) {
- if (bb.getBuffer().length == bb.getEnd() && bb.getLength() <
bb.getLimit()) {
- // Need to expand output buffer
- bb.makeSpace(outputCharChunk.getLength());
- } else {
- bb.flushBuffer();
- }
+ if (outputCharChunk.remaining() > 0) {
+ flushByteBuffer();
+ }
+ }
+
+ }
+
+ public void realWriteChars(CharBuffer from) throws IOException {
+
+ CharBuffer outputCharBuffer = from.slice();
+ while (outputCharBuffer.remaining() > 0) {
+ conv.convert(outputCharBuffer, bb);
+ if (bb.remaining() == 0) {
+ // Break out of the loop if more chars are needed to produce
any output
+ break;
+ }
+ if (outputCharBuffer.remaining() > 0) {
+ flushByteBuffer();
}
}
@@ -526,7 +526,11 @@ public class OutputBuffer extends Writer
return;
}
- cb.append((char) c);
+ if (isFull(cb)) {
+ flushCharBuffer();
+ }
+
+ transfer((char) c, cb);
charsWritten++;
}
@@ -551,7 +555,7 @@ public class OutputBuffer extends Writer
return;
}
- cb.append(c, off, len);
+ append(c, off, len);
charsWritten += len;
}
@@ -570,7 +574,17 @@ public class OutputBuffer extends Writer
if (s == null) {
throw new
NullPointerException(sm.getString("outputBuffer.writeNull"));
}
- cb.append(s, off, len);
+
+ int sOff = off;
+ int sEnd = off + len;
+ while (sOff < sEnd) {
+ int n = transfer(s, sOff, sEnd - sOff, cb);
+ sOff += n;
+ if (isFull(cb)) {
+ flushCharBuffer();
+ }
+ }
+
charsWritten += len;
}
@@ -585,8 +599,7 @@ public class OutputBuffer extends Writer
if (s == null) {
s = "null";
}
- cb.append(s);
- charsWritten += s.length();
+ write(s, 0, s.length());
}
@@ -686,8 +699,9 @@ public class OutputBuffer extends Writer
public void setBufferSize(int size) {
- if (size > bb.getLimit()) {// ??????
- bb.setLimit(size);
+ if (size != bb.capacity()) {
+ bb = ByteBuffer.allocate(size);
+ clear(bb);
}
}
@@ -697,8 +711,8 @@ public class OutputBuffer extends Writer
}
public void reset(boolean resetWriterStreamFlags) {
- bb.recycle();
- cb.recycle();
+ clear(bb);
+ clear(cb);
bytesWritten = 0;
charsWritten = 0;
if (resetWriterStreamFlags) {
@@ -713,7 +727,7 @@ public class OutputBuffer extends Writer
public int getBufferSize() {
- return bb.getLimit();
+ return bb.capacity();
}
@@ -739,4 +753,197 @@ public class OutputBuffer extends Writer
public void checkRegisterForWrite() {
coyoteResponse.checkRegisterForWrite();
}
+
+ /**
+ * Add data to the buffer.
+ *
+ * @param src Bytes array
+ * @param off Offset
+ * @param len Length
+ * @throws IOException Writing overflow data to the output channel failed
+ */
+ public void append(byte src[], int off, int len) throws IOException {
+ if (bb.remaining() == 0) {
+ appendByteArray(src, off, len);
+ } else {
+ int n = transfer(src, off, len, bb);
+ len = len - n;
+ off = off + n;
+ if (isFull(bb)) {
+ flushByteBuffer();
+ appendByteArray(src, off, len);
+ }
+ }
+ }
+
+ /**
+ * Add data to the buffer.
+ * @param src Char array
+ * @param off Offset
+ * @param len Length
+ * @throws IOException Writing overflow data to the output channel failed
+ */
+ public void append(char src[], int off, int len) throws IOException {
+ // if we have limit and we're below
+ if(len <= cb.capacity() - cb.limit()) {
+ transfer(src, off, len, cb);
+ return;
+ }
+
+ // Optimization:
+ // If len-avail < length ( i.e. after we fill the buffer with
+ // what we can, the remaining will fit in the buffer ) we'll just
+ // copy the first part, flush, then copy the second part - 1 write
+ // and still have some space for more. We'll still have 2 writes, but
+ // we write more on the first.
+ if(len + cb.limit() < 2 * cb.capacity()) {
+ /* If the request length exceeds the size of the output buffer,
+ flush the output buffer and then write the data directly.
+ We can't avoid 2 writes, but we can write more on the second
+ */
+ int n = transfer(src, off, len, cb);
+
+ flushCharBuffer();
+
+ transfer(src, off + n, len - n, cb);
+ } else {
+ // long write - flush the buffer and write the rest
+ // directly from source
+ flushCharBuffer();
+
+ realWriteChars(src, off, len);
+ }
+ }
+
+
+ public void append(ByteBuffer from) throws IOException {
+ if (bb.remaining() == 0) {
+ appendByteBuffer(from);
+ } else {
+ transfer(from, bb);
+ if (isFull(bb)) {
+ flushByteBuffer();
+ appendByteBuffer(from);
+ }
+ }
+ }
+
+ private void appendByteArray(byte src[], int off, int len) throws
IOException {
+ if (len == 0) {
+ return;
+ }
+
+ int limit = bb.capacity();
+ while (len >= limit) {
+ realWriteBytes(src, off, limit);
+ len = len - limit;
+ off = off + limit;
+ }
+
+ if (len > 0) {
+ transfer(src, off, len, bb);
+ }
+ }
+
+ private void appendByteBuffer(ByteBuffer from) throws IOException {
+ if (from.remaining() == 0) {
+ return;
+ }
+
+ int limit = bb.capacity();
+ int fromLimit = from.limit();
+ while (from.remaining() >= limit) {
+ from.limit(from.position() + limit);
+ realWriteBytes(from);
+ from.position(from.limit());
+ from.limit(fromLimit);
+ }
+
+ if (from.remaining() > 0) {
+ transfer(from, bb);
+ }
+ }
+
+ private void flushByteBuffer() throws IOException {
+ realWriteBytes(bb);
+ clear(bb);
+ }
+
+ private void flushCharBuffer() throws IOException {
+ realWriteChars(cb);
+ clear(cb);
+ }
+
+ private void transfer(byte b, ByteBuffer to) {
+ toWriteMode(to);
+ to.put(b);
+ toReadMode(to);
+ }
+
+ private void transfer(char b, CharBuffer to) {
+ toWriteMode(to);
+ to.put(b);
+ toReadMode(to);
+ }
+
+ private int transfer(byte[] buf, int off, int len, ByteBuffer to) {
+ toWriteMode(to);
+ int max = Math.min(len, to.remaining());
+ if (max > 0) {
+ to.put(buf, off, max);
+ }
+ toReadMode(to);
+ return max;
+ }
+
+ private int transfer(char[] buf, int off, int len, CharBuffer to) {
+ toWriteMode(to);
+ int max = Math.min(len, to.remaining());
+ if (max > 0) {
+ to.put(buf, off, max);
+ }
+ toReadMode(to);
+ return max;
+ }
+
+ private int transfer(String s, int off, int len, CharBuffer to) {
+ toWriteMode(to);
+ int max = Math.min(len, to.remaining());
+ if (max > 0) {
+ to.put(s, off, off + max);
+ }
+ toReadMode(to);
+ return max;
+ }
+
+ private void transfer(ByteBuffer from, ByteBuffer to) {
+ toWriteMode(to);
+ int max = Math.min(from.remaining(), to.remaining());
+ if (max > 0) {
+ int fromLimit = from.limit();
+ from.limit(from.position() + max);
+ to.put(from);
+ from.limit(fromLimit);
+ }
+ toReadMode(to);
+ }
+
+ private void clear(Buffer buffer) {
+ buffer.rewind().limit(0);
+ }
+
+ private boolean isFull(Buffer buffer) {
+ return buffer.limit() == buffer.capacity();
+ }
+
+ private void toReadMode(Buffer buffer) {
+ buffer.limit(buffer.position())
+ .reset();
+ }
+
+ private void toWriteMode(Buffer buffer) {
+ buffer.mark()
+ .position(buffer.limit())
+ .limit(buffer.capacity());
+ }
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java?rev=1766930&r1=1766929&r2=1766930&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java Fri
Oct 28 06:58:33 2016
@@ -122,6 +122,70 @@ public final class C2BConverter {
}
}
+ /**
+ * Convert the given characters to bytes.
+ *
+ * @param cc char input
+ * @param bc byte output
+ * @throws IOException An encoding error occurred
+ */
+ public void convert(CharBuffer cc, ByteBuffer bc) throws IOException {
+ if ((bb == null) || (bb.array() != bc.array())) {
+ // Create a new byte buffer if anything changed
+ bb = ByteBuffer.wrap(bc.array(), bc.limit(), bc.capacity() -
bc.limit());
+ } else {
+ // Initialize the byte buffer
+ bb.limit(bc.capacity());
+ bb.position(bc.limit());
+ }
+ if ((cb == null) || (cb.array() != cc.array())) {
+ // Create a new char buffer if anything changed
+ cb = CharBuffer.wrap(cc.array(), cc.arrayOffset() + cc.position(),
cc.remaining());
+ } else {
+ // Initialize the char buffer
+ cb.limit(cc.limit());
+ cb.position(cc.position());
+ }
+ CoderResult result = null;
+ // Parse leftover if any are present
+ if (leftovers.position() > 0) {
+ int pos = bb.position();
+ // Loop until one char is encoded or there is a encoder error
+ do {
+ leftovers.put((char) cc.get());
+ leftovers.flip();
+ result = encoder.encode(leftovers, bb, false);
+ leftovers.position(leftovers.limit());
+ leftovers.limit(leftovers.array().length);
+ } while (result.isUnderflow() && (bb.position() == pos));
+ if (result.isError() || result.isMalformed()) {
+ result.throwException();
+ }
+ cb.position(cc.position());
+ leftovers.position(0);
+ }
+ // Do the decoding and get the results into the byte chunk and the char
+ // chunk
+ result = encoder.encode(cb, bb, false);
+ if (result.isError() || result.isMalformed()) {
+ result.throwException();
+ } else if (result.isOverflow()) {
+ // Propagate current positions to the byte chunk and char chunk
+ bc.limit(bb.position());
+ cc.position(cb.position());
+ } else if (result.isUnderflow()) {
+ // Propagate current positions to the byte chunk and char chunk
+ bc.limit(bb.position());
+ cc.position(cb.position());
+ // Put leftovers in the leftovers char buffer
+ if (cc.remaining() > 0) {
+ leftovers.limit(leftovers.array().length);
+ leftovers.position(cc.remaining());
+ cc.get(leftovers.array(), 0, cc.remaining());
+ }
+ }
+ }
+
public Charset getCharset() {
return encoder.charset();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
