Author: jens
Date: Fri Jul 23 13:22:10 2010
New Revision: 967088

URL: http://svn.apache.org/viewvc?rev=967088&view=rev
Log:
INmemory: Fix a bug with setting the versioen series id param when called from 
Atom binding

Modified:
    
incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryService.java
    
incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryVersioningServiceImpl.java

Modified: 
incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryService.java
URL: 
http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryService.java?rev=967088&r1=967087&r2=967088&view=diff
==============================================================================
--- 
incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryService.java
 (original)
+++ 
incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryService.java
 Fri Jul 23 13:22:10 2010
@@ -301,8 +301,8 @@ public class InMemoryService extends Abs
 
     public List<ObjectData> getAllVersions(String repositoryId, String 
objectId, String versionSeriesId, String filter,
             Boolean includeAllowableActions, ExtensionsData extension) {
-        return fVerSvc.getAllVersions(getCallContext(), repositoryId, 
versionSeriesId, filter, includeAllowableActions,
-                extension, this);
+        return fVerSvc.getAllVersions(getCallContext(), repositoryId, 
versionSeriesId==null ? objectId : versionSeriesId, 
+                filter, includeAllowableActions, extension, this);
     }
 
     // --- discovery service ---

Modified: 
incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryVersioningServiceImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryVersioningServiceImpl.java?rev=967088&r1=967087&r2=967088&view=diff
==============================================================================
--- 
incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryVersioningServiceImpl.java
 (original)
+++ 
incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryVersioningServiceImpl.java
 Fri Jul 23 13:22:10 2010
@@ -140,6 +140,9 @@ public class InMemoryVersioningServiceIm
     public List<ObjectData> getAllVersions(CallContext context, String 
repositoryId, String versionSeriesId,
             String filter, Boolean includeAllowableActions, ExtensionsData 
extension, ObjectInfoHandler objectInfos) {
 
+        if (null == versionSeriesId)
+            throw new RuntimeException("getAllVersions requires a version 
series id, but ist was null.");
+
         StoredObject so = checkStandardParameters(repositoryId, 
versionSeriesId);
 
         if (!(so instanceof VersionedDocument))


Reply via email to