You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by cj...@apache.org on 2009/08/12 16:00:16 UTC
svn commit: r803515 -
/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java
Author: cjhoward
Date: Wed Aug 12 14:00:16 2009
New Revision: 803515
URL: http://svn.apache.org/viewvc?rev=803515&view=rev
Log:
MYFACES-2302 - Roll back change to FaceletViewDeclarationLanguage.restoreView()
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.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=803515&r1=803514&r2=803515&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 Wed Aug 12 14:00:16 2009
@@ -682,15 +682,14 @@
}
//else if (!_buildBeforeRestore)
//{
- //return super.restoreView(context, viewId);
+ return super.restoreView(context, viewId);
//}
//else
//{
// TODO: VALIDATE - Is _buildBeforeRestore relevant at all for 2.0? -= SL =-
// ANS: buildBeforeRestore evolved to partial state saving, so this logic
// is now on StateManagerStrategy implementation -= Leo U =-
- // CJH: uncommenting for now, seems to work.
-
+ /*
UIViewRoot viewRoot = createView(context, viewId);
context.setViewRoot(viewRoot);
@@ -713,8 +712,8 @@
application.getStateManager().restoreView(context, viewId, renderKitId);
return viewRoot;
- //}
-
+ }
+ */
}
/**