From: markt Date: Thu, 15 Jan 2009 21:47:53 +0000 (+0000) Subject: Removed unused code from o.a.t.util.buf X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=f230f47610d70526fe20861edc5cc228537a238d;p=tomcat7.0 Removed unused code from o.a.t.util.buf git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@734832 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/java/org/apache/tomcat/util/buf/Base64.java b/java/org/apache/tomcat/util/buf/Base64.java index c1e5e5f9e..49dc6a15b 100644 --- a/java/org/apache/tomcat/util/buf/Base64.java +++ b/java/org/apache/tomcat/util/buf/Base64.java @@ -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; diff --git a/java/org/apache/tomcat/util/buf/ByteChunk.java b/java/org/apache/tomcat/util/buf/ByteChunk.java index 257df24ae..ce3b4df82 100644 --- a/java/org/apache/tomcat/util/buf/ByteChunk.java +++ b/java/org/apache/tomcat/util/buf/ByteChunk.java @@ -112,7 +112,6 @@ public final class ByteChunk implements Cloneable, Serializable { 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 Cloneable, Serializable { // -------------------- Setup -------------------- public void allocate( int initial, int limit ) { - isOutput=true; if( buff==null || buff.length < initial ) { buff=new byte[initial]; } diff --git a/java/org/apache/tomcat/util/buf/CharChunk.java b/java/org/apache/tomcat/util/buf/CharChunk.java index e9157fd54..a2e8ca60b 100644 --- a/java/org/apache/tomcat/util/buf/CharChunk.java +++ b/java/org/apache/tomcat/util/buf/CharChunk.java @@ -64,8 +64,6 @@ public final class CharChunk implements Cloneable, Serializable, CharSequence { 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 Cloneable, Serializable, CharSequence { // -------------------- 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; } diff --git a/java/org/apache/tomcat/util/buf/MessageBytes.java b/java/org/apache/tomcat/util/buf/MessageBytes.java index 591e95f15..95fc78ff3 100644 --- a/java/org/apache/tomcat/util/buf/MessageBytes.java +++ b/java/org/apache/tomcat/util/buf/MessageBytes.java @@ -17,7 +17,6 @@ package org.apache.tomcat.util.buf; -import java.util.*; import java.io.Serializable; import java.io.IOException; @@ -114,7 +113,6 @@ public final class MessageBytes implements Cloneable, Serializable { hasHashCode=false; hasIntValue=false; hasLongValue=false; - hasDateValue=false; } @@ -132,7 +130,6 @@ public final class MessageBytes implements Cloneable, Serializable { hasHashCode=false; hasIntValue=false; hasLongValue=false; - hasDateValue=false; } /** Set the encoding. If the object was constructed from bytes[]. any @@ -162,7 +159,6 @@ public final class MessageBytes implements Cloneable, Serializable { hasHashCode=false; hasIntValue=false; hasLongValue=false; - hasDateValue=false; } /** Remove the cached string value. Use it after a conversion on the @@ -186,7 +182,6 @@ public final class MessageBytes implements Cloneable, Serializable { hasHashCode=false; hasIntValue=false; hasLongValue=false; - hasDateValue=false; if (s == null) { hasStrValue=false; type=T_NULL; @@ -543,8 +538,6 @@ public final class MessageBytes implements Cloneable, Serializable { private boolean hasIntValue=false; private long longValue; private boolean hasLongValue=false; - private Date dateValue; - private boolean hasDateValue=false; /** Set the buffer to the representation of an int */ @@ -585,7 +578,6 @@ public final class MessageBytes implements Cloneable, Serializable { hasHashCode=false; hasIntValue=true; hasLongValue=false; - hasDateValue=false; type=T_BYTES; } @@ -628,7 +620,6 @@ public final class MessageBytes implements Cloneable, Serializable { hasHashCode=false; hasIntValue=false; hasLongValue=true; - hasDateValue=false; type=T_BYTES; }