[gatein-commits] gatein SVN: r2070 - components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer.

[do-not-reply at jboss.org]

Author: chris.laprun at jboss.com
Date: 2010-03-09 21:55:56 -0500 (Tue, 09 Mar 2010)
New Revision: 2070

Modified:
   components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/InvocationHandler.java
Log:
- Changed namespace generation algorithm so that it matches the one used locally (and doesn't cause issues in JS).

Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/InvocationHandler.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/InvocationHandler.java	2010-03-10 02:54:11 UTC (rev 2069)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/InvocationHandler.java	2010-03-10 02:55:56 UTC (rev 2070)
@@ -23,13 +23,13 @@
 
 package org.gatein.wsrp.consumer;
 
-import org.gatein.common.net.URLTools;
 import org.gatein.pc.api.PortletInvokerException;
 import org.gatein.pc.api.invocation.PortletInvocation;
 import org.gatein.pc.api.invocation.response.ErrorResponse;
 import org.gatein.pc.api.invocation.response.PortletInvocationResponse;
 import org.gatein.pc.api.spi.InstanceContext;
 import org.gatein.pc.api.spi.WindowContext;
+import org.gatein.pc.portlet.impl.jsr168.PortletUtils;
 import org.oasis.wsrp.v1.InvalidCookie;
 import org.oasis.wsrp.v1.InvalidRegistration;
 import org.oasis.wsrp.v1.InvalidSession;
@@ -150,7 +150,8 @@
    {
       if (windowContext != null)
       {
-         return URLTools.safeEncodeForHTMLId(windowContext.getId());
+         // MUST match namespace generation used in PortletResponseImpl.getNamespace in portlet module...
+         return PortletUtils.generateNamespaceFrom(windowContext.getId());
       }
 
       return null;