Author: thomas.heute(a)jboss.com Date: 2008-10-03 10:45:25 -0400 (Fri, 03 Oct 2008) New Revision: 12028 Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java Log: JBPORTAL-2187: Partial refresh broke while integrating portlet container 2.0 Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java 2008-10-03 09:05:41 UTC (rev 12027) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java 2008-10-03 14:45:25 UTC (rev 12028) @@ -198,6 +198,14 @@ boolean fullRefresh = false; // + + if (ctx.getChanges() == null) + { + fullRefresh = true; + } + else + { + for (Iterator i = ctx.getChanges(); i.hasNext();) { NavigationalStateChange change = (NavigationalStateChange)i.next(); @@ -209,14 +217,14 @@ break; } NavigationalStateObjectChange update = (NavigationalStateObjectChange)change; - +/* // A change that modifies potentially the page structure if (update.getType() != NavigationalStateObjectChange.UPDATE) { fullRefresh = true; break; } - +*/ // Get the state key NavigationalStateKey key = update.getKey(); @@ -250,6 +258,7 @@ dirtyWindowIds.add(key.getId()); } } + } // Commit changes ctx.applyChanges(); Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java 2008-10-03 09:05:41 UTC (rev 12027) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java 2008-10-03 14:45:25 UTC (rev 12028) @@ -182,6 +182,10 @@ public Iterator<NavigationalStateObjectChange> getChanges() { + if (changes == null) + { + return null; + } return changes.values().iterator(); }