[Jboss-svn-commits] JBL Code SVN: r2187 - trunk/labs/jbossweb/src/share/classes/org/apache/catalina/connector

[<jbo...@li...>]

Author: rem...@jb...
Date: 2006-01-24 04:01:07 -0500 (Tue, 24 Jan 2006)
New Revision: 2187

Modified:
   trunk/labs/jbossweb/src/share/classes/org/apache/catalina/connector/InputBuffer.java
Log:
- Fix bug causing input problems triggered by usage of readLine (through mark/reset functionality).

Modified: trunk/labs/jbossweb/src/share/classes/org/apache/catalina/connector/InputBuffer.java
===================================================================
--- trunk/labs/jbossweb/src/share/classes/org/apache/catalina/connector/InputBuffer.java	2006-01-24 08:55:45 UTC (rev 2186)
+++ trunk/labs/jbossweb/src/share/classes/org/apache/catalina/connector/InputBuffer.java	2006-01-24 09:01:07 UTC (rev 2187)
@@ -216,6 +216,7 @@
         if (cb.getChars().length > size) {
             cb = new CharChunk(size);
             cb.setLimit(size);
+            cb.setOptimizedWrite(false);
             cb.setCharInputChannel(this);
             cb.setCharOutputChannel(this);
         } else {
@@ -337,6 +338,10 @@
             cb.setEnd(0);
         }
 
+        int limit = bb.getLength()+cb.getStart();
+        if (cb.getLimit() < limit) { 
+            cb.setLimit(limit);
+        }
         conv.convert(bb, cb);
         bb.setOffset(bb.getEnd());
         state = CHAR_STATE;