You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chemistry.apache.org by je...@apache.org on 2011/10/20 19:26:17 UTC

svn commit: r1186943 - in /chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory: DataObjectCreator.java storedobj/impl/ObjectStoreImpl.java

Author: jens
Date: Thu Oct 20 17:26:17 2011
New Revision: 1186943

URL: http://svn.apache.org/viewvc?rev=1186943&view=rev
Log:
fix TCK with version handling and stream updatibility

Modified:
    chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/DataObjectCreator.java
    chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/ObjectStoreImpl.java

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/DataObjectCreator.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/DataObjectCreator.java?rev=1186943&r1=1186942&r2=1186943&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/DataObjectCreator.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/DataObjectCreator.java Thu Oct 20 17:26:17 2011
@@ -127,7 +127,11 @@ public class DataObjectCreator {
         if (isDocument) {
             set.add(Action.CAN_ADD_OBJECT_TO_FOLDER);
             set.add(Action.CAN_REMOVE_OBJECT_FROM_FOLDER);
-            set.add(Action.CAN_SET_CONTENT_STREAM);
+            if (isVersioned) {
+                if (canCheckIn)
+                    set.add(Action.CAN_SET_CONTENT_STREAM);
+            } else
+                set.add(Action.CAN_SET_CONTENT_STREAM);
         }
 
         allowableActions.setAllowableActions(set);

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/ObjectStoreImpl.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/ObjectStoreImpl.java?rev=1186943&r1=1186942&r2=1186943&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/ObjectStoreImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/ObjectStoreImpl.java Thu Oct 20 17:26:17 2011
@@ -174,7 +174,6 @@ public class ObjectStoreImpl implements 
                 otherVersionsExists = false;
                 List<DocumentVersion> allVers = parentDoc.getAllVersions();
                 for (DocumentVersion ver : allVers) {
-                    parentDoc.deleteVersion(ver);
                     fStoredObjectMap.remove(ver.getId());
                 }
             } else {