From 712cba2d991c63eb7a34bf362a82ea20d4d11191 Mon Sep 17 00:00:00 2001 From: hns Date: Tue, 28 Jan 2003 12:22:46 +0000 Subject: [PATCH] Output debug buffer even if main response buffer has not been created. Fixes bug 212: http://helma.org/bugs/show_bug.cgi?id=212 --- src/helma/framework/ResponseTrans.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/helma/framework/ResponseTrans.java b/src/helma/framework/ResponseTrans.java index 898eb493..7db83c9d 100644 --- a/src/helma/framework/ResponseTrans.java +++ b/src/helma/framework/ResponseTrans.java @@ -335,17 +335,25 @@ public final class ResponseTrans implements Externalizable { if (charset == null) charset = "ISO-8859-1"; boolean encodingError = false; + // only close if the response hasn't been closed yet if (response == null) { - if (buffer != null) { - if (debugBuffer != null) + // if debug buffer exists, append it to main buffer + if (debugBuffer != null) { + if (buffer == null) + buffer = debugBuffer; + else buffer.append (debugBuffer); + } + // get the buffer's bytes in the specified encoding + if (buffer != null) { try { response = buffer.toString ().getBytes (charset); } catch (UnsupportedEncodingException uee) { encodingError = true; response = buffer.toString ().getBytes (); } - buffer = null; // make sure this is done only once, even with more requsts attached + // make sure this is done only once, even with more requsts attached + buffer = null; } else { response = new byte[0]; }