Author: phuong_vu Date: 2011-12-01 04:18:41 -0500 (Thu, 01 Dec 2011) New Revision: 8182 Modified: portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProvider.java Log: GTNPORTAL-2305 Possible NPE in org.gatein.portal.wsrp.structure.MOPConsumerStructureProvider Modified: portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProvider.java =================================================================== --- portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProvider.java 2011-12-01 09:08:40 UTC (rev 8181) +++ portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProvider.java 2011-12-01 09:18:41 UTC (rev 8182) @@ -275,8 +275,13 @@ // add suffix in case we have several windows with the same name in the page if (childrenWindows.containsKey(windowName)) { - if (windowName.endsWith("|")) + //Add this if check ad portlet window 's title could be null + if(windowName == null) { + windowName = "null" + uuid; + } + else if (windowName.endsWith("|")) + { windowName += "|"; } else