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/06/11 17:57:32 UTC
svn commit: r546177 - in
/jakarta/httpcomponents/httpcore/trunk/module-nio/src:
main/java/org/apache/http/impl/nio/reactor/SessionOutputBuffer.java
test/java/org/apache/http/impl/nio/reactor/TestSessionInOutBuffers.java
Author: olegk
Date: Mon Jun 11 08:57:31 2007
New Revision: 546177
URL: http://svn.apache.org/viewvc?view=rev&rev=546177
Log:
HTTPCORE-80: Fixed IllegalStateException in SessionOutputBuffer when line buffer size equals size of input
Contributed by Steffen Pingel <spingel at limewire.com>
Reviewed by Oleg Kalnichevski
Modified:
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionOutputBuffer.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/impl/nio/reactor/TestSessionInOutBuffers.java
Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionOutputBuffer.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionOutputBuffer.java?view=diff&rev=546177&r1=546176&r2=546177
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionOutputBuffer.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionOutputBuffer.java Mon Jun 11 08:57:31 2007
@@ -122,7 +122,7 @@
while (remaining > 0) {
int l = this.charbuffer.remaining();
boolean eol = false;
- if (remaining < l) {
+ if (remaining <= l) {
l = remaining;
// terminate the encoding process
eol = true;
Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/impl/nio/reactor/TestSessionInOutBuffers.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/impl/nio/reactor/TestSessionInOutBuffers.java?view=diff&rev=546177&r1=546176&r2=546177
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/impl/nio/reactor/TestSessionInOutBuffers.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/impl/nio/reactor/TestSessionInOutBuffers.java Mon Jun 11 08:57:31 2007
@@ -377,4 +377,10 @@
}
}
+ public void testInputMatchesBufferLength() throws Exception {
+ String s1 = "abcde";
+ SessionOutputBuffer outbuf = new SessionOutputBuffer(1024, 5);
+ outbuf.writeLine(s1);
+ }
+
}