You are viewing a plain text version of this content. The canonical link for it is here.
Posted to bridges-commits@portals.apache.org by ta...@apache.org on 2008/07/04 18:56:40 UTC
svn commit: r674092 -
/portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/FacesPortlet.java
Author: taylor
Date: Fri Jul 4 09:56:40 2008
New Revision: 674092
URL: http://svn.apache.org/viewvc?rev=674092&view=rev
Log:
patch from Ali Omar
https://issues.apache.org/jira/browse/PB-78
Modified:
portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/FacesPortlet.java
Modified: portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/FacesPortlet.java
URL: http://svn.apache.org/viewvc/portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/FacesPortlet.java?rev=674092&r1=674091&r2=674092&view=diff
==============================================================================
--- portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/FacesPortlet.java (original)
+++ portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/FacesPortlet.java Fri Jul 4 09:56:40 2008
@@ -487,39 +487,47 @@
if (actionRequest)
{
String vi = context.getViewRoot().getViewId();
- context.getApplication().getViewHandler().restoreView(context, vi);
- getLifecycle().execute(context);
- if (log.isTraceEnabled())
+ if (vi != null)
{
- log.trace("End Executing phases");
+ context.getApplication().getViewHandler().restoreView(context, vi);
+ getLifecycle().execute(context);
+ if (log.isTraceEnabled())
+ {
+ log.trace("End Executing phases");
+ }
+ // The view should have been restore.
+ // Pass it to the render request.
+ request.getPortletSession().setAttribute(
+ createViewRootKey(context, defaultPage, viewId),
+ context.getViewRoot());
+ ActionResponse actionResponse = (ActionResponse) response;
+
+ // save FacesMessage objects on session; so they can
+ // be restored during the render phase
+ saveFacesMessages(context, request.getPortletSession());
}
- // The view should have been restore.
- // Pass it to the render request.
- request.getPortletSession().setAttribute(
- createViewRootKey(context, defaultPage, viewId),
- context.getViewRoot());
- ActionResponse actionResponse = (ActionResponse) response;
-
- // save FacesMessage objects on session; so they can
- // be restored during the render phase
- saveFacesMessages(context, request.getPortletSession());
- } else if (renderRequest)
+ }
+ else if (renderRequest)
{
// getLifecycle().execute(context);
String vi = context.getViewRoot().getViewId();
- context.getApplication().getViewHandler().restoreView(context,
- vi);
-
- // restore FacesMessage objects that were previously established
- // in the lifecycle
- restoreFacesMessages(context, request.getPortletSession());
-
- getLifecycle().render(context);
- if (log.isTraceEnabled())
+ if (vi != null)
{
- log.trace("End executing RenderResponse phase ");
+ context.getApplication().getViewHandler().restoreView(context,
+ vi);
+
+ // restore FacesMessage objects that were previously established
+ // in the lifecycle
+ restoreFacesMessages(context, request.getPortletSession());
+
+ getLifecycle().render(context);
+ if (log.isTraceEnabled())
+ {
+ log.trace("End executing RenderResponse phase ");
+ }
}
- } else
+ }
+ else
{
throw new PortletException(
"Request must be of type ActionRequest or RenderRequest");
@@ -529,7 +537,8 @@
context.getViewRoot().getViewId(),
PortletSession.PORTLET_SCOPE);
- } catch (FacesException e)
+ }
+ catch (FacesException e)
{
Throwable t = ((FacesException) e).getCause();
if (t == null)
---------------------------------------------------------------------
To unsubscribe, e-mail: bridges-commits-unsubscribe@portals.apache.org
For additional commands, e-mail: bridges-commits-help@portals.apache.org