[portal-commits] JBoss Portal SVN: r11797 - branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination.

[portal-commits at lists.jboss.org]

Author: chris.laprun at jboss.com
Date: 2008-09-03 09:53:17 -0400 (Wed, 03 Sep 2008)
New Revision: 11797

Modified:
   branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java
Log:
- Update the holders when managers are re-created to avoid NPE.
- Renamed windowManagerHolder to parameterManagerHolder to be in sync with previous renames.

Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java	2008-09-03 12:16:13 UTC (rev 11796)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java	2008-09-03 13:53:17 UTC (rev 11797)
@@ -68,7 +68,7 @@
    private String selectedName;
    private CoordinationType selectedType;
    private static ThreadLocal<EventWiringManagerBean> eventManagerHolder = new ThreadLocal<EventWiringManagerBean>();
-   private static ThreadLocal<ParameterBindingManagerBean> windowManagerHolder = new ThreadLocal<ParameterBindingManagerBean>();
+   private static ThreadLocal<ParameterBindingManagerBean> parameterManagerHolder = new ThreadLocal<ParameterBindingManagerBean>();
    private static ThreadLocal<AliasBindingManagerBean> aliasManagerHolder = new ThreadLocal<AliasBindingManagerBean>();
    private String newName;
    static final String EDIT_COORDINATION = "editCoordination";
@@ -91,7 +91,7 @@
          }
          CoordinationBean bean()
          {
-            return windowManagerHolder.get();
+            return parameterManagerHolder.get();
          }},
        alias() {
           String localizationKey()
@@ -304,10 +304,13 @@
          selectedObjectId = pomb.getSelectedPortalObjectId();
 
          // reset the different managers as they are in session scope but need to be re-initialized each time a new
-         // page is reloaded
+         // page is reloaded, also need to update the holders for the different managers
          aliasManager = replaceInSession("aliasManager", new AliasBindingManagerBean(this));
+         aliasManagerHolder.set(aliasManager);
          eventManager = replaceInSession("eventManager", new EventWiringManagerBean(this));
+         eventManagerHolder.set(eventManager);
          parameterManager = replaceInSession("parameterManager", new ParameterBindingManagerBean(this));
+         parameterManagerHolder.set(parameterManager);
 
          // Extract metadata only on window children and only if needed
          if (isExplicitEventsUsed() || isExplicitParametersUsed())
@@ -448,7 +451,7 @@
 
       // make manager accessible to CoordinationType 
       eventManagerHolder.set(eventManager);
-      windowManagerHolder.set(parameterManager);
+      parameterManagerHolder.set(parameterManager);
       aliasManagerHolder.set(aliasManager);
    }