Author: julien(a)jboss.com Date: 2008-07-23 16:32:41 -0400 (Wed, 23 Jul 2008) New Revision: 11566 Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPageNavigationalState.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/CoordinationService.java Log: fix precedence of window over alias bindings Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPageNavigationalState.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPageNavigationalState.java 2008-07-23 20:17:48 UTC (rev 11565) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPageNavigationalState.java 2008-07-23 20:32:41 UTC (rev 11566) @@ -488,12 +488,11 @@ String[] value = entry.getValue(); // - CoordinationStrategy strategy = manager.resolveBindingStrategy(getWindow(windowName).getPage()); + CoordinationStrategy strategy = manager.resolveBindingStrategy(window.getPage()); // - Collection<String> bindings = manager.getBindingNames(getWindow(windowName), name); + Collection<String> bindings = manager.getBindingNames(window, name); - // Don't store the URI as a page scoped public render parameter but window scoped // Also for explicit strategy and parameter with no bindings if (CoreConstants.JBOSS_PORTAL_CONTENT_URI.equals(name) Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/CoordinationService.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/CoordinationService.java 2008-07-23 20:17:48 UTC (rev 11565) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/CoordinationService.java 2008-07-23 20:32:41 UTC (rev 11566) @@ -184,12 +184,15 @@ } } - // - for (AliasBindingInfo info : getAliasBindings(window.getPage())) + // If we have nothing let's try aliases + if (names.isEmpty()) { - if (info.getQNames().contains(name)) + for (AliasBindingInfo info : getAliasBindings(window.getPage())) { - names.add(info.getName()); + if (info.getQNames().contains(name)) + { + names.add(info.getName()); + } } }