Author: julien(a)jboss.com Date: 2007-05-23 08:35:12 -0400 (Wed, 23 May 2007) New Revision: 7314 Modified: trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java Log: minor update of ajax response handler Modified: trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java 2007-05-23 12:25:16 UTC (rev 7313) +++ trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java 2007-05-23 12:35:12 UTC (rev 7314) @@ -69,6 +69,7 @@ import org.jboss.portal.theme.page.WindowResult; import org.jboss.portal.theme.page.WindowContext; import org.jboss.portal.theme.page.Region; +import org.apache.log4j.Logger; import java.io.StringWriter; import java.util.Set; @@ -116,6 +117,9 @@ // } /** . */ + private static final Logger log = Logger.getLogger(AjaxResponseHandler.class); + + /** . */ private PortalObjectContainer portalObjectContainer; /** . */ @@ -254,15 +258,8 @@ ctx.applyChanges(); // - if (fullRefresh) + if (!fullRefresh) { - ViewPageCommand rpc = new ViewPageCommand(page.getId()); - String url = controllerContext.renderURL(rpc, null, null); - UpdatePageLocationResponse dresp = new UpdatePageLocationResponse(url); - return new AjaxResponse(dresp); - } - else - { ArrayList windowToRefresh = new ArrayList(); for (Iterator i = page.getChildren(PortalObject.WINDOW_MASK).iterator();i.hasNext();) { @@ -347,13 +344,25 @@ } catch (Exception e) { - e.printStackTrace(); + log.error("An error occured during the computation of window markup", e); + + // + fullRefresh = true; } } // - return new AjaxResponse(updatePage); + if (!fullRefresh) + { + return new AjaxResponse(updatePage); + } } + + // We perform a full refresh + ViewPageCommand rpc = new ViewPageCommand(page.getId()); + String url = controllerContext.renderURL(rpc, null, null); + UpdatePageLocationResponse dresp = new UpdatePageLocationResponse(url); + return new AjaxResponse(dresp); } else {