You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2010/07/02 23:50:10 UTC
svn commit: r960118 -
/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/PartialResponseWriterImpl.java
Author: lu4242
Date: Fri Jul 2 21:50:10 2010
New Revision: 960118
URL: http://svn.apache.org/viewvc?rev=960118&view=rev
Log:
MYFACES-2779 PartialResponse bogus response on render all because of falsely positioned development stage script tag (use cloneWithWriter for instantiation)
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/PartialResponseWriterImpl.java
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/PartialResponseWriterImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/PartialResponseWriterImpl.java?rev=960118&r1=960117&r2=960118&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/PartialResponseWriterImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/PartialResponseWriterImpl.java Fri Jul 2 21:50:10 2010
@@ -71,15 +71,15 @@ import java.util.List;
public class PartialResponseWriterImpl extends PartialResponseWriter {
class StackEntry {
- HtmlResponseWriterImpl writer;
+ ResponseWriter writer;
StringWriter _doubleBuffer;
- StackEntry(HtmlResponseWriterImpl writer, StringWriter doubleBuffer) {
+ StackEntry(ResponseWriter writer, StringWriter doubleBuffer) {
this.writer = writer;
_doubleBuffer = doubleBuffer;
}
- public HtmlResponseWriterImpl getWriter() {
+ public ResponseWriter getWriter() {
return writer;
}
@@ -96,7 +96,7 @@ public class PartialResponseWriterImpl e
}
}
- HtmlResponseWriterImpl _cdataDoubleBufferWriter = null;
+ ResponseWriter _cdataDoubleBufferWriter = null;
StringWriter _doubleBuffer = null;
List<StackEntry> _nestingStack = new LinkedList<StackEntry>();
@@ -116,7 +116,8 @@ public class PartialResponseWriterImpl e
private void openDoubleBuffer() {
_doubleBuffer = new StringWriter();
- _cdataDoubleBufferWriter = new HtmlResponseWriterImpl(_doubleBuffer, super.getContentType(), super.getCharacterEncoding());
+ //_cdataDoubleBufferWriter = new HtmlResponseWriterImpl(_doubleBuffer, super.getContentType(), super.getCharacterEncoding());
+ _cdataDoubleBufferWriter = getWrapped().cloneWithWriter(_doubleBuffer);
StackEntry entry = new StackEntry(_cdataDoubleBufferWriter, _doubleBuffer);