[portal-commits] JBoss Portal SVN: r11953 - branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/impl/jcr/ha.

[portal-commits at lists.jboss.org]

Author: sohil.shah at jboss.com
Date: 2008-09-23 13:35:50 -0400 (Tue, 23 Sep 2008)
New Revision: 11953

Modified:
   branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/impl/jcr/ha/HAJCRCMS.java
Log:
JBPORTAL-2161 - Special character in filename generates NullPointerException
JBPORTAL-2162 - Special character in foldername throws RepositoryException
JBPORTAL-2163 - File- and foldernames with special characters and umlauts are not exported correctly
(Fixing an issue with slave nodes in the clustered setup)

Modified: branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/impl/jcr/ha/HAJCRCMS.java
===================================================================
--- branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/impl/jcr/ha/HAJCRCMS.java	2008-09-23 15:12:31 UTC (rev 11952)
+++ branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/impl/jcr/ha/HAJCRCMS.java	2008-09-23 17:35:50 UTC (rev 11953)
@@ -107,10 +107,12 @@
             returnValue = invoker.invoke("execute", new Class[]{Command.class}, new Object[]{cmd});
             if(returnValue instanceof CMSException)
             {
-               if(returnValue.toString().indexOf("Access to this resource is denied") != -1)
+               CMSException cmsException = (CMSException)returnValue;
+               if(cmsException.toString().indexOf("Access to this resource is denied") != -1 ||
+                  cmsException.hasPathFormatFailure())
                {
-                  throw (CMSException)returnValue;
-               }
+                  throw cmsException;
+               }               
                else
                {
                   returnValue = null;
@@ -170,7 +172,7 @@
       }
       catch(CMSException ce)
       {
-         if (ce.toString().indexOf("Access to this resource is denied") != -1)
+         if (ce.toString().indexOf("Access to this resource is denied") != -1 || ce.hasPathFormatFailure())
          {
             result = ce;
          }