Author: julien(a)jboss.com Date: 2008-07-27 08:50:22 -0400 (Sun, 27 Jul 2008) New Revision: 11594 Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPortletControllerContext.java Log: fix customization bug where the controller portlet controller context was using directly an instance lookup instead of using the customization manager Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPortletControllerContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPortletControllerContext.java 2008-07-27 12:38:45 UTC (rev 11593) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPortletControllerContext.java 2008-07-27 12:50:22 UTC (rev 11594) @@ -24,6 +24,7 @@ import org.apache.log4j.Logger; import org.jboss.portal.Mode; +import org.jboss.portal.identity.User; import org.jboss.portal.core.controller.ControllerCommand; import org.jboss.portal.core.controller.ControllerContext; import org.jboss.portal.core.impl.model.content.InternalContentProviderRegistry; @@ -36,6 +37,7 @@ import org.jboss.portal.core.model.portal.Page; import org.jboss.portal.core.model.portal.PortalObject; import org.jboss.portal.core.model.portal.Window; +import org.jboss.portal.core.model.CustomizationManager; import org.jboss.portal.core.navstate.NavigationalStateContext; import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.PortletInvokerException; @@ -241,9 +243,15 @@ Window window = PortletInvocationFactory.getTargetWindow(actionInvocation); // - Instance instance = instances.get(window.getName()); + User user = controllerContext.getUser(); // + CustomizationManager customizationManager = controllerContext.getController().getCustomizationManager(); + + // + Instance instance = customizationManager.getInstance(window, user); + + // return instance.invoke(actionInvocation); }