chemistry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r1459195 - in /chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server: InMemoryObjectServiceImpl.java InMemoryService.java
Date Thu, 21 Mar 2013 09:07:33 GMT
Author: jens
Date: Thu Mar 21 09:07:33 2013
New Revision: 1459195

URL: http://svn.apache.org/r1459195
Log:
InMemory: Fix an NPE in bulkUpdateProperties when using AtomPub

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

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryObjectServiceImpl.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/server/InMemoryObjectServiceImpl.java?rev=1459195&r1=1459194&r2=1459195&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryObjectServiceImpl.java
(original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryObjectServiceImpl.java
Thu Mar 21 09:07:33 2013
@@ -788,17 +788,18 @@ public class InMemoryObjectServiceImpl e
     
     public List<BulkUpdateObjectIdAndChangeToken> bulkUpdateProperties(CallContext
context, String repositoryId,
             List<BulkUpdateObjectIdAndChangeToken> objectIdAndChangeToken, Properties
properties,
-            List<String> addSecondaryTypeIds, List<String> removeSecondaryTypeIds,
ExtensionsData extension) {
+            List<String> addSecondaryTypeIds, List<String> removeSecondaryTypeIds,
ExtensionsData extension,
+            ObjectInfoHandler objectInfos) {
 
         List<BulkUpdateObjectIdAndChangeToken> result = new ArrayList<BulkUpdateObjectIdAndChangeToken>();
         for ( BulkUpdateObjectIdAndChangeToken obj: objectIdAndChangeToken) {
             Holder<String> objId = new Holder<String>(obj.getId());
             Holder<String> changeToken = new Holder<String>(obj.getChangeToken());
             try {
-                updateProperties(context, repositoryId, objId, changeToken, properties, null,
null, null);
+                updateProperties(context, repositoryId, objId, changeToken, properties, null,
null, objectInfos);
                 result.add(new BulkUpdateObjectIdAndChangeTokenImpl(obj.getId(), changeToken.getValue()));
             } catch (Exception e) {
-                LOG.error("updating properties in bulk uapdate failed for object" + obj.getId()
+ ": ", e);
+                LOG.error("updating properties in bulk upadate failed for object" + obj.getId()
+ ": ", e);
             }
         }
         return result;

Modified: 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/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryService.java?rev=1459195&r1=1459194&r2=1459195&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryService.java
(original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryService.java
Thu Mar 21 09:07:33 2013
@@ -338,7 +338,7 @@ public class InMemoryService extends Abs
             List<BulkUpdateObjectIdAndChangeToken> objectIdAndChangeToken, Properties
properties,
             List<String> addSecondaryTypeIds, List<String> removeSecondaryTypeIds,
ExtensionsData extension) {
         return fObjSvc.bulkUpdateProperties(getCallContext(), repositoryId, objectIdAndChangeToken,
properties,
-                addSecondaryTypeIds, removeSecondaryTypeIds, extension);
+                addSecondaryTypeIds, removeSecondaryTypeIds, extension, this);
     }
 
     // --- versioning service ---



Mime
View raw message