Merge branch '1.2.x' of github.com:grails/grails into 1.2.x

Author: jeffscottbrown

src/java/org/codehaus/groovy/grails/web/pages/GroovyPageOutputStack.java

@@ -121,10 +121,12 @@ private GroovyPageOutputStack(Writer topWriter, boolean autoSync) {
 
 	private Writer unwrapTargetWriter(Writer targetWriter) {
 		if(targetWriter instanceof GrailsPrintWriter) {
-			return ((GrailsPrintWriter)targetWriter).getOut();
-		} else {
-			return targetWriter;
+			GrailsPrintWriter gpw=((GrailsPrintWriter)targetWriter);
+			if(gpw.isAllowUnwrappingOut()) {
+				return ((GrailsPrintWriter)targetWriter).getOut();
+			}
 		}
+		return targetWriter;
 	}
 
 	public void push(final Writer newWriter) {

src/java/org/codehaus/groovy/grails/web/sitemesh/GrailsRoutablePrintWriter.java

@@ -20,7 +20,26 @@ public static interface DestinationFactory {
     public GrailsRoutablePrintWriter(DestinationFactory factory) {
         super(new NullWriter());
         this.factory = factory;
+        
     }
+    
+	/**
+	 * 
+	 * tell others if getOut() can be called to "unwrap" the actual target writer
+	 * 
+	 * if the destination hasn't been activated, don't allow it.
+	 *  
+	 * 
+	 * @see org.codehaus.groovy.grails.web.util.GrailsPrintWriter#isAllowUnwrappingOut()
+	 */
+	@Override
+	public boolean isAllowUnwrappingOut() {
+		if(destination==null) {
+			return false;
+		} else {
+			return true;
+		}
+	}
 
 	public Writer getOut() {
 		return getDestination();
@@ -199,4 +218,5 @@ public void close() throws IOException {
 
     }
 
+
 }

src/java/org/codehaus/groovy/grails/web/util/GrailsPrintWriter.java

@@ -25,13 +25,18 @@ public class GrailsPrintWriter extends PrintWriter {
 	private static final char CRLF[] = { '\r', '\n' };
 	protected boolean trouble=false;
 	protected Writer out;
+	protected boolean allowUnwrappingOut=true;
 	private boolean finalTargetHere=false;
 	private boolean usageFlag=false;
 
 	public GrailsPrintWriter(Writer out) {
 		super(out);
 		this.out=out;
 	}
+	
+	public boolean isAllowUnwrappingOut() {
+		return allowUnwrappingOut;
+	}
 
 	public Writer getOut() {
 		return out;