You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chemistry.apache.org by fm...@apache.org on 2010/03/09 09:32:18 UTC

svn commit: r920730 - in /incubator/chemistry/trunk/opencmis: opencmis-commons/opencmis-commons-impl/src/main/java/org/apache/opencmis/commons/impl/ opencmis-server/opencmis-server-impl/src/main/java/org/apache/opencmis/server/impl/atompub/

Author: fmui
Date: Tue Mar  9 08:32:17 2010
New Revision: 920730

URL: http://svn.apache.org/viewvc?rev=920730&view=rev
Log:
fixed ACLPropagation parameter

Modified:
    incubator/chemistry/trunk/opencmis/opencmis-commons/opencmis-commons-impl/src/main/java/org/apache/opencmis/commons/impl/UrlBuilder.java
    incubator/chemistry/trunk/opencmis/opencmis-server/opencmis-server-impl/src/main/java/org/apache/opencmis/server/impl/atompub/AtomPubUtils.java

Modified: incubator/chemistry/trunk/opencmis/opencmis-commons/opencmis-commons-impl/src/main/java/org/apache/opencmis/commons/impl/UrlBuilder.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/opencmis/opencmis-commons/opencmis-commons-impl/src/main/java/org/apache/opencmis/commons/impl/UrlBuilder.java?rev=920730&r1=920729&r2=920730&view=diff
==============================================================================
--- incubator/chemistry/trunk/opencmis/opencmis-commons/opencmis-commons-impl/src/main/java/org/apache/opencmis/commons/impl/UrlBuilder.java (original)
+++ incubator/chemistry/trunk/opencmis/opencmis-commons/opencmis-commons-impl/src/main/java/org/apache/opencmis/commons/impl/UrlBuilder.java Tue Mar  9 08:32:17 2010
@@ -21,6 +21,7 @@ package org.apache.opencmis.commons.impl
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 
+import org.apache.opencmis.commons.enums.AclPropagation;
 import org.apache.opencmis.commons.enums.IncludeRelationships;
 import org.apache.opencmis.commons.enums.RelationshipDirection;
 import org.apache.opencmis.commons.enums.UnfileObjects;
@@ -181,6 +182,9 @@ public class UrlBuilder {
     else if (value instanceof ReturnVersion) {
       return ((ReturnVersion) value).value();
     }
+    else if (value instanceof AclPropagation) {
+      return ((AclPropagation) value).value();
+    }
 
     return value.toString();
   }

Modified: incubator/chemistry/trunk/opencmis/opencmis-server/opencmis-server-impl/src/main/java/org/apache/opencmis/server/impl/atompub/AtomPubUtils.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/opencmis/opencmis-server/opencmis-server-impl/src/main/java/org/apache/opencmis/server/impl/atompub/AtomPubUtils.java?rev=920730&r1=920729&r2=920730&view=diff
==============================================================================
--- incubator/chemistry/trunk/opencmis/opencmis-server/opencmis-server-impl/src/main/java/org/apache/opencmis/server/impl/atompub/AtomPubUtils.java (original)
+++ incubator/chemistry/trunk/opencmis/opencmis-server/opencmis-server-impl/src/main/java/org/apache/opencmis/server/impl/atompub/AtomPubUtils.java Tue Mar  9 08:32:17 2010
@@ -199,10 +199,11 @@ public final class AtomPubUtils {
       Method m = clazz.getMethod("fromValue", new Class[] { String.class });
       return (T) m.invoke(null, new Object[] { value });
     }
-    catch (IllegalArgumentException iae) {
-      throw new CmisInvalidArgumentException("Invalid parameter '" + name + "'!");
-    }
     catch (Exception e) {
+      if (e instanceof IllegalArgumentException) {
+        throw new CmisInvalidArgumentException("Invalid parameter '" + name + "'!");
+      }
+
       throw new CmisRuntimeException(e.getMessage(), e);
     }
   }