You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mc...@apache.org on 2009/07/30 17:12:19 UTC
svn commit: r799314 - in
/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view:
facelets/FaceletViewDeclarationLanguage.java
jsp/JspViewDeclarationLanguage.java
Author: mconcini
Date: Thu Jul 30 15:12:19 2009
New Revision: 799314
URL: http://svn.apache.org/viewvc?rev=799314&view=rev
Log:
MYFACES-2183 - some tweaks to renderView to more closely match the spec.
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguage.java
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java?rev=799314&r1=799313&r2=799314&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java Thu Jul 30 15:12:19 2009
@@ -250,7 +250,7 @@
if (end >= 0)
{
// save state
- Object stateObj = stateMgr.saveSerializedView(context);
+ Object stateObj = stateMgr.saveView(context);
String stateStr;
if (stateObj == null)
{
@@ -258,7 +258,7 @@
}
else
{
- stateMgr.writeState(context, (StateManager.SerializedView) stateObj);
+ stateMgr.writeState(context, stateObj);
stateStr = stateWriter.getAndResetBuffer();
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguage.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguage.java?rev=799314&r1=799313&r2=799314&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguage.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguage.java Thu Jul 30 15:12:19 2009
@@ -220,8 +220,12 @@
}
actuallyRenderView(context, view);
-
- context.setResponseWriter(oldResponseWriter);
+
+ if(oldResponseWriter != null)
+ {
+ context.setResponseWriter(oldResponseWriter);
+ }
+
// We're done with the document - now we can write all content
// to the response, properly replacing the state-markers on the way out