You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2007/01/25 18:46:49 UTC
svn commit: r499870 - in
/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl:
DefaultNHttpClientConnection.java DefaultNHttpServerConnection.java
Author: olegk
Date: Thu Jan 25 09:46:48 2007
New Revision: 499870
URL: http://svn.apache.org/viewvc?view=rev&rev=499870
Log:
Fixed flawed logic in the session buffers status test
Modified:
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/DefaultNHttpClientConnection.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/DefaultNHttpServerConnection.java
Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/DefaultNHttpClientConnection.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/DefaultNHttpClientConnection.java?view=diff&rev=499870&r1=499869&r2=499870
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/DefaultNHttpClientConnection.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/DefaultNHttpClientConnection.java Thu Jan 25 09:46:48 2007
@@ -119,7 +119,7 @@
handler.exception(this, ex);
} finally {
// Finally set buffered input flag
- this.hasBufferedInput = this.contentDecoder != null && this.inbuf.hasData();
+ this.hasBufferedInput = this.inbuf.hasData();
}
}
@@ -148,7 +148,7 @@
handler.exception(this, ex);
} finally {
// Finally set buffered output flag
- this.hasBufferedOutput = this.contentEncoder != null && this.outbuf.hasData();
+ this.hasBufferedOutput = this.outbuf.hasData();
}
if (this.request == null && !this.closed) {
Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/DefaultNHttpServerConnection.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/DefaultNHttpServerConnection.java?view=diff&rev=499870&r1=499869&r2=499870
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/DefaultNHttpServerConnection.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/DefaultNHttpServerConnection.java Thu Jan 25 09:46:48 2007
@@ -119,7 +119,7 @@
handler.exception(this, ex);
} finally {
// Finally set buffered input flag
- this.hasBufferedInput = this.contentDecoder != null && this.inbuf.hasData();
+ this.hasBufferedInput = this.inbuf.hasData();
}
}
@@ -148,7 +148,7 @@
handler.exception(this, ex);
} finally {
// Finally set the buffered output flag
- this.hasBufferedOutput = this.contentEncoder != null && this.outbuf.hasData();
+ this.hasBufferedOutput = this.outbuf.hasData();
}
}