svn commit: r892380 - /myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java

[lu...@apache.org]

Author: lu4242
Date: Fri Dec 18 21:10:49 2009
New Revision: 892380

URL: http://svn.apache.org/viewvc?rev=892380&view=rev
Log:
MYFACES-2462 <ui:debug /> is not working (Thanks to Jakob Korherr for this patch)

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=892380&r1=892379&r2=892380&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 Fri Dec 18 21:10:49 2009
@@ -938,6 +938,17 @@
             handleRenderException(context, e);
         }
     }
+    
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public UIViewRoot createView(FacesContext context, String viewId)
+    {
+        // we have to check for a possible debug request
+        UIDebug.debugRequest(context);
+        return super.createView(context, viewId);
+    }
 
     /**
      * {@inheritDoc}
@@ -945,10 +956,17 @@
     @Override
     public UIViewRoot restoreView(FacesContext context, String viewId)
     {
-        if (UIDebug.debugRequest(context))
-        {
-            return new UIViewRoot();
-        }
+        // Currently there is no way, in which UIDebug.debugRequest(context)
+        // can create debug information and return true at this point,
+        // because this method is only accessed if the current request
+        // is a postback, which will never be true for a debug page.
+        // The only point where valid debug output can be produced by now
+        // is in createView() -= Jakob Korherr =-
+        //if (UIDebug.debugRequest(context))
+        //{
+        //    return new UIViewRoot();
+        //}
+        
         //else if (!_buildBeforeRestore)
         //{
             return super.restoreView(context, viewId);