Author: markt
Date: Tue Jan 16 10:14:05 2018
New Revision: 1821225
URL: http://svn.apache.org/viewvc?rev=1821225&view=rev
Log:
Revert 1821202 and add comment regarding compaction
Modified:
tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
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=1821225&r1=1821224&r2=1821225&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java Tue Jan 16
10:14:05 2018
@@ -551,6 +551,7 @@ public final class ByteChunk extends Abs
}
tmp = new byte[newSize];
+ // Compacts buffer
System.arraycopy(buff, start, tmp, 0, end - start);
buff = tmp;
tmp = null;
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java?rev=1821225&r1=1821224&r2=1821225&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java Tue Jan 16
10:14:05 2018
@@ -410,11 +410,10 @@ public final class CharChunk extends Abs
}
tmp = new char[newSize];
- System.arraycopy(buff, start, tmp, 0, end - start);
+ // Some calling code assumes buffer will not be compacted
+ System.arraycopy(buff, 0, tmp, 0, end);
buff = tmp;
tmp = null;
- end = end - start;
- start = 0;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
