Attachment #27122 for bug #51324

View | Details | Raw Unified | Return to bug 51324
Collapse All | Expand All




        
        bb.recycle(); 
        closed = false;
        doFlush = false;
        suspended = false;
        
        if (conv!= null) {

        if (suspended)
            return;

        try {
            doFlush = true;
            if (initial) {
                coyoteResponse.sendHeaders();
                initial = false;
            }
            if (bb.getLength() > 0) {
                bb.flushBuffer();
            }
        } finally {
            doFlush = false;
        }
        if (bb.getLength() > 0) {
            bb.flushBuffer();
        }
        doFlush = false;

        if (realFlush) {
            coyoteResponse.action(ActionCode.CLIENT_FLUSH, 

Return to bug 51324

Lines 228-233 Link Here

(-)java/org/apache/catalina/connector/OutputBuffer.java (-8 / +12 lines)
228		228
229	bb.recycle();	229	bb.recycle();
230	closed = false;	230	closed = false;
		231	doFlush = false;
231	suspended = false;	232	suspended = false;
232		233
233	if (conv!= null) {	234	if (conv!= null) {
Lines 310-324 Link Here
310	if (suspended)	311	if (suspended)
311	return;	312	return;
312		313
313	doFlush = true;	314	try {
314	if (initial) {	315	doFlush = true;
315	coyoteResponse.sendHeaders();	316	if (initial) {
316	initial = false;	317	coyoteResponse.sendHeaders();
		318	initial = false;
		319	}
		320	if (bb.getLength() > 0) {
		321	bb.flushBuffer();
		322	}
		323	} finally {
		324	doFlush = false;
317	}	325	}
318	if (bb.getLength() > 0) {
319	bb.flushBuffer();
320	}
321	doFlush = false;
322		326
323	if (realFlush) {	327	if (realFlush) {
324	coyoteResponse.action(ActionCode.CLIENT_FLUSH,	328	coyoteResponse.action(ActionCode.CLIENT_FLUSH,