[gatein-commits] gatein SVN: r8299 - portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure.
Author: chris.laprun(a)jboss.com
Date: 2012-01-17 10:29:03 -0500 (Tue, 17 Jan 2012)
New Revision: 8299
Modified:
portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProvider.java
Log:
- GTNWSRP-276: Fixed wrong handling of null window name.
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 2012-01-13
13:14:59 UTC (rev 8298)
+++
portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProvider.java 2012-01-17
15:29:03 UTC (rev 8299)
@@ -272,16 +272,17 @@
public void addWindow(String windowName, String uuid)
{
+ // if we don't have a window name, use the UUID
+ if(ParameterValidation.isNullOrEmpty(windowName))
+ {
+ windowName = uuid;
+ }
+
// add suffix in case we have several windows with the same name in the page
if (childrenWindows.containsKey(windowName))
{
- //Add this if check ad portlet window 's title could be null
- if(windowName == null)
+ if (windowName.endsWith("|"))
{
- windowName = "null" + uuid;
- }
- else if (windowName.endsWith("|"))
- {
windowName += "|";
}
else