Filip Hanik - Dev Lists wrote:
and so the pissing contest begins, just in a different area.
ok, the so the only thing required for the fix is
1. available() call on the intermediate stream
2. make sure the B2CConverter uses while(available) instead of while(true)
here is the 5.5 patch (had you actually taken a look at it)
http://people.apache.org/~fhanik/tomcat/b2c/patch.txt
nothing in there is 1.5-ish, hence I don't see your veto justified.
if you want to veto it, you have to come up with a reason why this patch
(see url) doesn't work
and possibly a different fix, since its a significant bug, and we are
tagging 5.5.25 on Friday
You do not seem to be able to read posts from other people. He does not
want NIO stuff in that branch, as it is used by other Tomcat versions.
This is a technical objection, so it is a valid veto.
If you'd like to revert and patch using simply this, then most likely he
would be happy:
Index: util/java/org/apache/tomcat/util/buf/B2CConverter.java
===================================================================
--- util/java/org/apache/tomcat/util/buf/B2CConverter.java (revision
568320)
+++ util/java/org/apache/tomcat/util/buf/B2CConverter.java (working copy)
@@ -82,7 +82,7 @@
{
try {
// read from the reader
- while( true ) { // conv.ready() ) {
+ while( iis.available()>0 ) { // conv.ready() ) {
int cnt=conv.read( result, 0, BUFFER_SIZE );
if( cnt <= 0 ) {
// End of stream ! - we may be in a bad state
@@ -251,7 +251,12 @@
public final int read() throws IOException {
return (pos < end ) ? (buf[pos++] & 0xff) : -1;
}
+
+ public int available() throws IOException {
+ return end-pos;
+ }
+
// -------------------- Internal methods --------------------
void setBuffer( byte b[], int p, int l ) {
Rémy
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
