[gatein-commits] gatein SVN: r7213 - epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component.

Author: mwringe Date: 2011-08-24 14:55:21 -0400 (Wed, 24 Aug 2011) New Revision: 7213 Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java Log: JBEPP-1108: Fix NPE when clicking back button during node creation (patch from GateIn commit 6803) Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2011-08-24 16:25:16 UTC (rev 7212) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2011-08-24 18:55:21 UTC (rev 7213) @@ -416,7 +416,11 @@ uiNavigationPopup.setWindowSize(400, 400); context.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, context).broadcast(); }