[portal-commits] JBoss Portal SVN: r11965 - in branches/JBoss_Portal_Branch_2_6: core/src/main/org/jboss/portal/core/model/portal and 1 other directory.

[portal-commits at lists.jboss.org]

Author: thomas.heute at jboss.com
Date: 2008-09-24 09:33:43 -0400 (Wed, 24 Sep 2008)
New Revision: 11965

Modified:
   branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml
   branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectPath.java
Log:
JBPORTAL-2165: Portal objects with a name longer than 57 cause javascript error in the admin portlet


Modified: branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml	2008-09-24 13:24:15 UTC (rev 11964)
+++ branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml	2008-09-24 13:33:43 UTC (rev 11965)
@@ -47,7 +47,7 @@
         are pushed to the http://repository.jboss.com site.
       -->
 
-      <componentref name="jboss-portal/modules/common" version="1.1.2"/>
+      <componentref name="jboss-portal/modules/common" version="1.1-SNAPSHOT"/>
       <componentref name="jboss-portal/modules/web" version="1.1.0"/>
       <componentref name="jboss-portal/modules/test" version="1.0.1.SP1"/>
       <componentref name="jboss-portal/modules/portlet" version="1.0.3"/>

Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectPath.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectPath.java	2008-09-24 13:24:15 UTC (rev 11964)
+++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectPath.java	2008-09-24 13:33:43 UTC (rev 11965)
@@ -539,7 +539,7 @@
       {
          try
          {
-            byte[] bytes = Base64.decode(name);
+            byte[] bytes = Base64.decode(name, Base64.EncodingOption.NOCARRIAGERETURN);
             return new String(bytes, "UTF-8");
          }
          catch (UnsupportedEncodingException e)
@@ -553,7 +553,7 @@
          try
          {
             byte[] bytes = name.getBytes("UTF-8");
-            name = Base64.encodeBytes(bytes);
+            name = Base64.encodeBytes(bytes, Base64.EncodingOption.NOCARRIAGERETURN);
             return name;
          }
          catch (UnsupportedEncodingException e)