Author: markt
Date: Tue Sep 26 19:03:58 2006
New Revision: 450288
URL: http://svn.apache.org/viewvc?view=rev&rev=450288
Log:
Code clean-up. No functional change.
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/InputBuffer.java
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/InputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/InputBuffer.java?view=diff&rev=450288&r1=450287&r2=450288
==============================================================================
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/InputBuffer.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/InputBuffer.java
Tue Sep 26 19:03:58 2006
@@ -79,30 +79,12 @@
/**
- * Number of bytes read.
- */
- private int bytesRead = 0;
-
-
- /**
- * Number of chars read.
- */
- private int charsRead = 0;
-
-
- /**
* Flag which indicates if the input buffer is closed.
*/
private boolean closed = false;
/**
- * Byte chunk used to input bytes.
- */
- private ByteChunk inputChunk = new ByteChunk();
-
-
- /**
* Encoding to use.
*/
private String enc;
@@ -186,7 +168,7 @@
* @param coyoteRequest Associated Coyote request
*/
public void setRequest(Request coyoteRequest) {
- this.coyoteRequest = coyoteRequest;
+ this.coyoteRequest = coyoteRequest;
}
@@ -209,8 +191,6 @@
public void recycle() {
state = INITIAL_STATE;
- bytesRead = 0;
- charsRead = 0;
// If usage of mark made the buffer too big, reallocate it
if (cb.getChars().length > size) {
@@ -272,7 +252,7 @@
* @throws IOException An underlying IOException occurred
*/
public int realReadBytes(byte cbuf[], int off, int len)
- throws IOException {
+ throws IOException {
if (closed)
return -1;
@@ -340,7 +320,7 @@
int limit = bb.getLength()+cb.getStart();
if( cb.getLimit() < limit )
- cb.setLimit(limit);
+ cb.setLimit(limit);
conv.convert(bb, cb);
bb.setOffset(bb.getEnd());
state = CHAR_STATE;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
