Author: violetagg
Date: Fri Oct 28 11:54:49 2016
New Revision: 1767010
URL: http://svn.apache.org/viewvc?rev=1767010&view=rev
Log:
o.a.catalina.connector.InputBuffer 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/InputBuffer.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 28 11:54:49 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,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,1762168,176217
2,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,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,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,1762168,176217
2,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763635,1763718,1763786,1763798-1763799,1763813,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/InputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/InputBuffer.java?rev=1767010&r1=1767009&r2=1767010&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/InputBuffer.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/InputBuffer.java
Fri Oct 28 11:54:49 2016
@@ -18,7 +18,9 @@ package org.apache.catalina.connector;
import java.io.IOException;
import java.io.Reader;
+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;
@@ -75,14 +77,13 @@ public class InputBuffer extends Reader
/**
* The byte buffer.
*/
- private final ByteChunk bb;
- private ByteBuffer tempRead;
+ private ByteBuffer bb;
/**
- * The chunk buffer.
+ * The char buffer.
*/
- private CharChunk cb;
+ private CharBuffer cb;
/**
@@ -122,6 +123,12 @@ public class InputBuffer extends Reader
/**
+ * Char buffer limit.
+ */
+ private int readLimit;
+
+
+ /**
* Buffer size.
*/
private final int size;
@@ -148,16 +155,11 @@ public class InputBuffer extends Reader
public InputBuffer(int size) {
this.size = size;
- tempRead = ByteBuffer.allocate(size);
- tempRead.flip();
- bb = new ByteChunk(size);
- bb.setLimit(size);
- bb.setByteInputChannel(this);
- cb = new CharChunk(size);
- cb.setLimit(size);
- cb.setOptimizedWrite(false);
- cb.setCharInputChannel(this);
- cb.setCharOutputChannel(this);
+ bb = ByteBuffer.allocate(size);
+ clear(bb);
+ cb = CharBuffer.allocate(size);
+ clear(cb);
+ readLimit = size;
}
@@ -185,17 +187,15 @@ public class InputBuffer extends Reader
state = INITIAL_STATE;
// If usage of mark made the buffer too big, reallocate it
- if (cb.getChars().length > size) {
- cb = new CharChunk(size);
- cb.setLimit(size);
- cb.setOptimizedWrite(false);
- cb.setCharInputChannel(this);
- cb.setCharOutputChannel(this);
+ if (cb.capacity() > size) {
+ cb = CharBuffer.allocate(size);
+ clear(cb);
} else {
- cb.recycle();
+ clear(cb);
}
+ readLimit = size;
markPos = -1;
- bb.recycle();
+ clear(bb);
closed = false;
if (conv != null) {
@@ -222,9 +222,9 @@ public class InputBuffer extends Reader
public int available() {
int available = 0;
if (state == BYTE_STATE) {
- available = bb.getLength();
+ available = bb.remaining();
} else if (state == CHAR_STATE) {
- available = cb.getLength();
+ available = cb.remaining();
}
if (available == 0) {
coyoteRequest.action(ActionCode.AVAILABLE,
@@ -259,9 +259,9 @@ public class InputBuffer extends Reader
public boolean isFinished() {
int available = 0;
if (state == BYTE_STATE) {
- available = bb.getLength();
+ available = bb.remaining();
} else if (state == CHAR_STATE) {
- available = cb.getLength();
+ available = cb.remaining();
}
if (available > 0) {
return false;
@@ -319,9 +319,7 @@ public class InputBuffer extends Reader
}
int result = coyoteRequest.doRead(this);
- bb.setBytes(tempRead.array(), tempRead.arrayOffset() +
tempRead.position(),
- tempRead.remaining());
- tempRead.position(0).limit(0);
+
return result;
}
@@ -331,7 +329,10 @@ public class InputBuffer extends Reader
throw new IOException(sm.getString("inputBuffer.streamClosed"));
}
- return bb.substract();
+ if (checkByteBufferEof()) {
+ return -1;
+ }
+ return bb.get() & 0xFF;
}
@@ -340,7 +341,12 @@ public class InputBuffer extends Reader
throw new IOException(sm.getString("inputBuffer.streamClosed"));
}
- return bb.substract(b, off, len);
+ if (checkByteBufferEof()) {
+ return -1;
+ }
+ int n = Math.min(len, bb.remaining());
+ bb.get(b, off, n);
+ return n;
}
@@ -350,17 +356,26 @@ public class InputBuffer extends Reader
* before the operation, the limit will be the position incremented by
* the number of the transfered bytes.
*
- * @param b the ByteBuffer into which bytes are to be written.
+ * @param to the ByteBuffer into which bytes are to be written.
* @return an integer specifying the actual number of bytes read, or -1 if
* the end of the stream is reached
* @throws IOException if an input or output exception has occurred
*/
- public int read(ByteBuffer b) throws IOException {
+ public int read(ByteBuffer to) throws IOException {
if (closed) {
throw new IOException(sm.getString("inputBuffer.streamClosed"));
}
- return bb.substract(b);
+ if (checkByteBufferEof()) {
+ return -1;
+ }
+ int n = Math.min(to.remaining(), bb.remaining());
+ int orgLimit = bb.limit();
+ bb.limit(bb.position() + n);
+ to.put(bb);
+ bb.limit(orgLimit);
+ to.limit(to.position()).position(to.position() - n);
+ return n;
}
@@ -376,8 +391,7 @@ public class InputBuffer extends Reader
@Override
public void realWriteChars(char c[], int off, int len) throws IOException {
markPos = -1;
- cb.setOffset(0);
- cb.setEnd(0);
+ clear(cb);
}
@@ -392,7 +406,7 @@ public class InputBuffer extends Reader
boolean eof = false;
- if (bb.getLength() <= 0) {
+ if (bb.remaining() <= 0) {
int nRead = realReadBytes();
if (nRead < 0) {
eof = true;
@@ -400,26 +414,24 @@ public class InputBuffer extends Reader
}
if (markPos == -1) {
- cb.setOffset(0);
- cb.setEnd(0);
+ clear(cb);
} else {
// Make sure there's enough space in the worst case
- cb.makeSpace(bb.getLength());
- if ((cb.getBuffer().length - cb.getEnd()) == 0 && bb.getLength()
!= 0) {
+ makeSpace(bb.remaining());
+ if ((cb.capacity() - cb.limit()) == 0 && bb.remaining() != 0) {
// We went over the limit
- cb.setOffset(0);
- cb.setEnd(0);
+ clear(cb);
markPos = -1;
}
}
state = CHAR_STATE;
- conv.convert(bb, cb, eof);
+ conv.convert(bb, cb, this, eof);
- if (cb.getLength() == 0 && eof) {
+ if (cb.remaining() == 0 && eof) {
return -1;
} else {
- return cb.getLength();
+ return cb.remaining();
}
}
@@ -431,7 +443,10 @@ public class InputBuffer extends Reader
throw new IOException(sm.getString("inputBuffer.streamClosed"));
}
- return cb.substract();
+ if (checkCharBufferEof()) {
+ return -1;
+ }
+ return cb.get();
}
@@ -453,7 +468,12 @@ public class InputBuffer extends Reader
throw new IOException(sm.getString("inputBuffer.streamClosed"));
}
- return cb.substract(cbuf, off, len);
+ if (checkCharBufferEof()) {
+ return -1;
+ }
+ int n = Math.min(len, cb.remaining());
+ cb.get(cbuf, off, n);
+ return n;
}
@@ -469,12 +489,12 @@ public class InputBuffer extends Reader
long nRead = 0;
while (nRead < n) {
- if (cb.getLength() >= n) {
- cb.setOffset(cb.getStart() + (int) n);
+ if (cb.remaining() >= n) {
+ cb.position(cb.position() + (int) n);
nRead = n;
} else {
- nRead += cb.getLength();
- cb.setOffset(cb.getEnd());
+ nRead += cb.remaining();
+ cb.position(cb.limit());
int nb = realReadChars();
if (nb < 0) {
break;
@@ -510,18 +530,16 @@ public class InputBuffer extends Reader
throw new IOException(sm.getString("inputBuffer.streamClosed"));
}
- if (cb.getLength() <= 0) {
- cb.setOffset(0);
- cb.setEnd(0);
+ if (cb.remaining() <= 0) {
+ clear(cb);
} else {
- if ((cb.getBuffer().length > (2 * size)) && (cb.getLength()) <
(cb.getStart())) {
- System.arraycopy(cb.getBuffer(), cb.getStart(),
cb.getBuffer(), 0, cb.getLength());
- cb.setEnd(cb.getLength());
- cb.setOffset(0);
+ if ((cb.capacity() > (2 * size)) && (cb.remaining()) <
(cb.position())) {
+ cb.compact();
+ cb.flip();
}
}
- cb.setLimit(cb.getStart() + readAheadLimit + size);
- markPos = cb.getStart();
+ readLimit = cb.position() + readAheadLimit + size;
+ markPos = cb.position();
}
@@ -534,14 +552,14 @@ public class InputBuffer extends Reader
if (state == CHAR_STATE) {
if (markPos < 0) {
- cb.recycle();
+ clear(cb);
markPos = -1;
throw new IOException();
} else {
- cb.setOffset(markPos);
+ cb.position(markPos);
}
} else {
- bb.recycle();
+ clear(bb);
}
}
@@ -604,13 +622,13 @@ public class InputBuffer extends Reader
@Override
public void setByteBuffer(ByteBuffer buffer) {
- tempRead = buffer;
+ bb = buffer;
}
@Override
public ByteBuffer getByteBuffer() {
- return tempRead;
+ return bb;
}
@@ -618,4 +636,56 @@ public class InputBuffer extends Reader
public void expand(int size) {
// no-op
}
+
+
+ public boolean checkByteBufferEof() throws IOException {
+ if (bb.remaining() == 0) {
+ int n = realReadBytes();
+ if (n < 0) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private boolean checkCharBufferEof() throws IOException {
+ if (cb.remaining() == 0) {
+ int n = realReadChars();
+ if (n < 0) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private void clear(Buffer buffer) {
+ buffer.rewind().limit(0);
+ }
+
+ private void makeSpace(int count) {
+ int desiredSize = cb.limit() + count;
+ if(desiredSize > readLimit) {
+ desiredSize = readLimit;
+ }
+
+ if(desiredSize <= cb.capacity()) {
+ return;
+ }
+
+ int newSize = 2 * cb.capacity();
+ if(desiredSize >= newSize) {
+ newSize= 2 * cb.capacity() + count;
+ }
+
+ if (newSize > readLimit) {
+ newSize = readLimit;
+ }
+
+ CharBuffer tmp = CharBuffer.allocate(newSize);
+ cb.position(0);
+ tmp.put(cb);
+ tmp.flip();
+ cb = tmp;
+ tmp = null;
+ }
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java?rev=1767010&r1=1767009&r2=1767010&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java Fri
Oct 28 11:54:49 2016
@@ -199,6 +199,82 @@ public class B2CConverter {
}
}
+ /**
+ * Convert the given bytes to characters.
+ *
+ * @param bc byte input
+ * @param cc char output
+ * @param ic byte input channel
+ * @param endOfInput Is this all of the available data
+ *
+ * @throws IOException If the conversion can not be completed
+ */
+ public void convert(ByteBuffer bc, CharBuffer cc,
ByteChunk.ByteInputChannel ic, boolean endOfInput)
+ throws IOException {
+ if ((bb == null) || (bb.array() != bc.array())) {
+ // Create a new byte buffer if anything changed
+ bb = ByteBuffer.wrap(bc.array(), bc.arrayOffset() + bc.position(),
bc.remaining());
+ } else {
+ // Initialize the byte buffer
+ bb.limit(bc.limit());
+ bb.position(bc.position());
+ }
+ if ((cb == null) || (cb.array() != cc.array())) {
+ // Create a new char buffer if anything changed
+ cb = CharBuffer.wrap(cc.array(), cc.limit(), cc.capacity() -
cc.limit());
+ } else {
+ // Initialize the char buffer
+ cb.limit(cc.capacity());
+ cb.position(cc.limit());
+ }
+ CoderResult result = null;
+ // Parse leftover if any are present
+ if (leftovers.position() > 0) {
+ int pos = cb.position();
+ // Loop until one char is decoded or there is a decoder error
+ do {
+ byte chr;
+ if (bc.remaining() == 0) {
+ int n = ic.realReadBytes();
+ chr = n < 0 ? -1 : bc.get();
+ } else {
+ chr = bc.get();
+ }
+ leftovers.put(chr);
+ leftovers.flip();
+ result = decoder.decode(leftovers, cb, endOfInput);
+ leftovers.position(leftovers.limit());
+ leftovers.limit(leftovers.array().length);
+ } while (result.isUnderflow() && (cb.position() == pos));
+ if (result.isError() || result.isMalformed()) {
+ result.throwException();
+ }
+ bb.position(bc.position());
+ leftovers.position(0);
+ }
+ // Do the decoding and get the results into the byte chunk and the char
+ // chunk
+ result = decoder.decode(bb, cb, endOfInput);
+ if (result.isError() || result.isMalformed()) {
+ result.throwException();
+ } else if (result.isOverflow()) {
+ // Propagate current positions to the byte chunk and char chunk, if
+ // this continues the char buffer will get resized
+ bc.position(bb.position());
+ cc.limit(cb.position());
+ } else if (result.isUnderflow()) {
+ // Propagate current positions to the byte chunk and char chunk
+ bc.position(bb.position());
+ cc.limit(cb.position());
+ // Put leftovers in the leftovers byte buffer
+ if (bc.remaining() > 0) {
+ leftovers.limit(leftovers.array().length);
+ leftovers.position(bc.remaining());
+ bc.get(leftovers.array(), 0, bc.remaining());
+ }
+ }
+ }
+
public Charset getCharset() {
return decoder.charset();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
