[gatein-commits] gatein SVN: r7431 - epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component.
Author: mwringe
Date: 2011-09-14 20:00:54 -0400 (Wed, 14 Sep 2011)
New Revision: 7431
Modified:
epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java
Log:
JBEPP-1108: merge in patch from GTNPORTAL-2101 to fix NPE issue
Modified:
epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java
===================================================================
---
epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java 2011-09-14
23:54:33 UTC (rev 7430)
+++
epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java 2011-09-15
00:00:54 UTC (rev 7431)
@@ -300,7 +300,11 @@
uiNavigationPopup.setRendered(true);
event.getRequestContext().addUIComponentToUpdateByAjax(uiNavigationPopup.getParent());
- selector.getUserNodeLabels().put(uiPageNodeForm.getPageNode().getId(),
uiPageNodeForm.getPageNode().getI18nizedLabels());
+ TreeNode pageNode = uiPageNodeForm.getPageNode();
+ if (pageNode != null)
+ {
+ selector.getUserNodeLabels().put(pageNode.getId(),
pageNode.getI18nizedLabels());
+ }
selector.createEvent("NodeModified", Phase.PROCESS,
event.getRequestContext()).broadcast();
}