Author: kkolinko
Date: Tue Jun 1 16:16:34 2010
New Revision: 950142
URL: http://svn.apache.org/viewvc?rev=950142&view=rev
Log:
Code cleanup in o.a.t.util.buf classes
It is port of r481614 from tc5.5.x
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/Base64.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/StringCache.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/UEncoder.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=950142&r1=950141&r2=950142&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jun 1 16:16:34 2010
@@ -140,16 +140,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: markt, rjung
-1:
-* Code cleanup in o.a.t.util.buf classes - port from tc5.5.x
- (It is backport of r481614 of TC55,
- cd java/org/apache/tomcat/util/buf
- svn merge --ignore-ancestry --depth infinity -c 481614
https://svn.apache.org/repos/asf/tomcat/connectors/trunk/util/java/org/apache/tomcat/util/b...@481614
.
- plus resolving a conflict in UDecoder.java
- ) Patch:
-
http://people.apache.org/~kkolinko/patches/2010-05-20_tc6_r481614_cleanup.patch
- +1: kkolinko, markt, rjung
- -1:
-
* Fix ByteChunk.indexOf(String, ...) when the string is of length 1
http://svn.apache.org/viewvc?rev=945231&view=rev
+1: kkolinko, markt
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java?rev=950142&r1=950141&r2=950142&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java Tue
Jun 1 16:16:34 2010
@@ -187,8 +187,6 @@ public class B2CConverter {
*
*/
final class ReadConvertor extends InputStreamReader {
- // stream with flush() and close(). overriden.
- private IntermediateInputStream iis;
// Has a private, internal byte[8192]
@@ -198,7 +196,6 @@ final class ReadConvertor extends Input
throws UnsupportedEncodingException
{
super( in, enc );
- iis=in;
}
/** Overriden - will do nothing but reset internal state.
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/Base64.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/Base64.java?rev=950142&r1=950141&r2=950142&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/Base64.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/Base64.java Tue Jun 1
16:16:34 2010
@@ -42,7 +42,6 @@ public final class Base64 {
static private final int TWENTYFOURBITGROUP = 24;
static private final int EIGHTBIT = 8;
static private final int SIXTEENBIT = 16;
- static private final int SIXBIT = 6;
static private final int FOURBYTE = 4;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java?rev=950142&r1=950141&r2=950142&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java Tue Jun
1 16:16:34 2010
@@ -112,7 +112,6 @@ public final class ByteChunk implements
private ByteInputChannel in = null;
private ByteOutputChannel out = null;
- private boolean isOutput=false;
private boolean optimizedWrite=true;
/**
@@ -156,7 +155,6 @@ public final class ByteChunk implements
// -------------------- Setup --------------------
public void allocate( int initial, int limit ) {
- isOutput=true;
if( buff==null || buff.length < initial ) {
buff=new byte[initial];
}
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java?rev=950142&r1=950141&r2=950142&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java Tue Jun
1 16:16:34 2010
@@ -64,8 +64,6 @@ public final class CharChunk implements
private boolean isSet=false; // XXX
- private boolean isOutput=false;
-
// -1: grow undefinitely
// maximum amount to be cached
private int limit=-1;
@@ -117,14 +115,12 @@ public final class CharChunk implements
// -------------------- Setup --------------------
public void allocate( int initial, int limit ) {
- isOutput=true;
if( buff==null || buff.length < initial ) {
buff=new char[initial];
}
this.limit=limit;
start=0;
end=0;
- isOutput=true;
isSet=true;
}
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/StringCache.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/StringCache.java?rev=950142&r1=950141&r2=950142&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/StringCache.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/StringCache.java Tue
Jun 1 16:16:34 2010
@@ -257,8 +257,6 @@ public class StringCache {
while (n < size) {
Object key = tempMap.lastKey();
ArrayList list = (ArrayList) tempMap.get(key);
- ByteEntry[] list2 =
- (ByteEntry[]) list.toArray(new
ByteEntry[list.size()]);
for (int i = 0; i < list.size() && n < size; i++) {
ByteEntry entry = (ByteEntry) list.get(i);
tempChunk.setBytes(entry.name, 0,
entry.name.length);
@@ -371,8 +369,6 @@ public class StringCache {
while (n < size) {
Object key = tempMap.lastKey();
ArrayList list = (ArrayList) tempMap.get(key);
- CharEntry[] list2 =
- (CharEntry[]) list.toArray(new
CharEntry[list.size()]);
for (int i = 0; i < list.size() && n < size; i++) {
CharEntry entry = (CharEntry) list.get(i);
tempChunk.setChars(entry.name, 0,
entry.name.length);
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java?rev=950142&r1=950141&r2=950142&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java Tue Jun
1 16:16:34 2010
@@ -30,9 +30,6 @@ import java.io.IOException;
*/
public final class UDecoder {
- private static org.apache.juli.logging.Log log=
- org.apache.juli.logging.LogFactory.getLog(UDecoder.class );
-
protected static final boolean ALLOW_ENCODED_SLASH =
Boolean.valueOf(System.getProperty("org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH",
"false")).booleanValue();
@@ -276,10 +273,4 @@ public final class UDecoder {
return digit;
}
- private final static int debug=0;
- private static void log( String s ) {
- if (log.isDebugEnabled())
- log.debug("URLDecoder: " + s );
- }
-
}
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/UEncoder.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/UEncoder.java?rev=950142&r1=950141&r2=950142&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/UEncoder.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/UEncoder.java Tue Jun
1 16:16:34 2010
@@ -141,10 +141,6 @@ public final class UEncoder {
// -------------------- Internal implementation --------------------
//
- private void init() {
-
- }
-
private void initSafeChars() {
safeChars=new BitSet(128);
int i;
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=950142&r1=950141&r2=950142&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Jun 1 16:16:34 2010
@@ -246,6 +246,9 @@
<bug>49236</bug>: Do not use indexing when packing Tomcat JARs.
(kkolinko)
</fix>
+ <fix>
+ Remove unused code from org.apache.tomcat.util.buf classes. (kkolinko)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
