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/09/27 15:11:31 UTC
svn commit: r1001727 - in /incubator/chemistry/opencmis/trunk: chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/ chemistry-opencmis-client/chemistry-opencmis-client...

Author: fmui
Date: Mon Sep 27 13:11:31 2010
New Revision: 1001727

URL: http://svn.apache.org/viewvc?rev=1001727&view=rev
Log:
- fixed policies link
- made operation context more robust

Modified:
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/PolicyServiceImpl.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/OperationContextImpl.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AtomPubUtils.java

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/PolicyServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/PolicyServiceImpl.java?rev=1001727&r1=1001726&r2=1001727&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/PolicyServiceImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/PolicyServiceImpl.java Mon Sep 27 13:11:31 2010
@@ -117,13 +117,14 @@ public class PolicyServiceImpl extends A
             List<CmisObjectType> policyList = port.getAppliedPolicies(repositoryId, objectId, filter,
                     convert(extension));
 
+            List<ObjectData> result = new ArrayList<ObjectData>();
+            
             // no list?
             if (policyList == null) {
-                return null;
+                return result;
             }
 
             // convert list
-            List<ObjectData> result = new ArrayList<ObjectData>();
             for (CmisObjectType policy : policyList) {
                 result.add(convert(policy));
             }

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/OperationContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/OperationContextImpl.java?rev=1001727&r1=1001726&r2=1001727&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/OperationContextImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/OperationContextImpl.java Mon Sep 27 13:11:31 2010
@@ -151,7 +151,7 @@ public class OperationContextImpl implem
     }
 
     public void setFilterString(String propertyFilter) {
-        if (propertyFilter == null) {
+        if ((propertyFilter == null) || (propertyFilter.trim().length() == 0)) {
             setFilter(null);
             return;
         }
@@ -267,7 +267,7 @@ public class OperationContextImpl implem
     }
 
     public void setRenditionFilterString(String renditionFilter) {
-        if (renditionFilter == null) {
+        if ((renditionFilter == null) || (renditionFilter.trim().length() == 0)) {
             setRenditionFilter(null);
             return;
         }

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AtomPubUtils.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AtomPubUtils.java?rev=1001727&r1=1001726&r2=1001727&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AtomPubUtils.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AtomPubUtils.java Mon Sep 27 13:11:31 2010
@@ -345,7 +345,7 @@ public final class AtomPubUtils {
         }
 
         if (info.supportsPolicies()) {
-            entry.writeAclLink(compileUrl(baseUrl, RESOURCE_POLICIES, info.getId()));
+            entry.writePoliciesLink(compileUrl(baseUrl, RESOURCE_POLICIES, info.getId()));
         }
 
         if (info.supportsRelationships()) {