Author: kkolinko
Date: Wed Aug 29 00:44:15 2012
New Revision: 1378402
URL: http://svn.apache.org/viewvc?rev=1378402&view=rev
Log:
Revert fixes for https://issues.apache.org/bugzilla/show_bug.cgi?id=53725
(r1377343 + r1378378 + r1378389)
I have a different one that I'll commit shortly.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.java?rev=1378402&r1=1378401&r2=1378402&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/filters/FlushableGZIPOutputStream.java
Wed Aug 29 00:44:15 2012
@@ -41,7 +41,6 @@ public class FlushableGZIPOutputStream e
*/
private byte[] lastByte = new byte[1];
private boolean hasLastByte = false;
- private boolean flushingLastByte = false;
@Override
public void write(byte[] bytes) throws IOException {
@@ -99,9 +98,7 @@ public class FlushableGZIPOutputStream e
if (hasLastByte) {
// Clear the flag first, because write() may fail
hasLastByte = false;
- flushingLastByte = true;
super.write(lastByte, 0, 1);
- flushingLastByte = false;
}
}
@@ -140,6 +137,7 @@ public class FlushableGZIPOutputStream e
if (len > 0) {
out.write(buf, 0, len);
}
- } while (len !=0 && !flushingLastByte || !def.needsInput());
+ } while (len != 0);
}
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
