Fix for GRAILS-8582

Author: lhotari

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

@@ -14,11 +14,15 @@
  */
 package org.codehaus.groovy.grails.web.sitemesh;
 
+import groovy.lang.Writable;
+
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.Writer;
 
+import org.codehaus.groovy.grails.web.util.GrailsPrintWriter;
 import org.codehaus.groovy.grails.web.util.GrailsPrintWriterAdapter;
+import org.codehaus.groovy.grails.web.util.StreamCharBuffer;
 
 public class GrailsRoutablePrintWriter extends GrailsPrintWriterAdapter {
 
@@ -65,6 +69,7 @@ private PrintWriter getDestination() {
                 setError();
             }
             super.out = destination;
+            super.setTarget(destination);
         }
         return destination;
     }
@@ -279,4 +284,22 @@ public void blockFlushAndClose() {
         this.blockClose = true;
         this.blockFlush = true;
     }
+
+    @Override
+    public GrailsPrintWriter leftShift(Object value) throws IOException {
+        getDestination();
+        return super.leftShift(value);
+    }
+
+    @Override
+    public GrailsPrintWriter leftShift(StreamCharBuffer otherBuffer) {
+        getDestination();
+        return super.leftShift(otherBuffer);
+    }
+
+    @Override
+    public GrailsPrintWriter leftShift(Writable writable) {
+        getDestination();
+        return super.leftShift(writable);
+    }
 }

grails-web/src/main/groovy/org/codehaus/groovy/grails/web/util/GrailsPrintWriterAdapter.java

@@ -31,6 +31,10 @@ public class GrailsPrintWriterAdapter extends PrintWriter implements GrailsWrapp
 
     public GrailsPrintWriterAdapter(Writer wrapped) {
         super(new NullWriter());
+        setTarget(wrapped);
+    }
+
+    public void setTarget(Writer wrapped) {
         if (wrapped instanceof GrailsPrintWriter) {
             this.target = ((GrailsPrintWriter)wrapped);
         }