svn commit: r1547536 - /chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryObjectServiceImpl.java

[je...@apache.org]

Author: jens
Date: Tue Dec  3 19:22:26 2013
New Revision: 1547536

URL: http://svn.apache.org/r1547536
Log:
InMemory: Minor improvements

Modified:
    chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryObjectServiceImpl.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=1547536&r1=1547535&r2=1547536&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 Tue Dec  3 19:22:26 2013
@@ -832,7 +832,7 @@ public class InMemoryObjectServiceImpl e
         Acl aclRemove = org.apache.chemistry.opencmis.inmemory.TypeValidator.expandAclMakros(context.getUsername(),
                 removeACEs);
 
-        validator.createDocument(context, repositoryId, folderId, policies, extension);
+        StoredObject so = validator.createDocument(context, repositoryId, folderId, policies, extension);
 
         // Validation stuff
         TypeValidator.validateRequiredSystemProperties(properties);
@@ -851,8 +851,6 @@ public class InMemoryObjectServiceImpl e
 
         Folder folder = null;
         if (null != folderId) {
-            StoredObject so = objectStore.getObjectById(folderId);
-
             if (null == so) {
                 throw new CmisInvalidArgumentException(" Cannot create document, folderId: " + folderId 
                         + " is invalid");
@@ -899,7 +897,7 @@ public class InMemoryObjectServiceImpl e
             user = UNKNOWN_USER;
         }
 
-        StoredObject so = null;
+        StoredObject createdDoc = null;
         ContentStream contentStreamNew = contentStream;
         // check if content stream parameters are set and if not set some
         // defaults
@@ -927,14 +925,14 @@ public class InMemoryObjectServiceImpl e
         if (((DocumentTypeDefinition) typeDef).isVersionable()) {
             DocumentVersion version = objectStore.createVersionedDocument(name, propMap, user, folder, policies,
                     aclAdd, aclRemove, contentStreamNew, versioningState);
-            so = version; // return the version and not the version series to
+            createdDoc = version; // return the version and not the version series to
                           // caller
         } else {
             Document doc = objectStore.createDocument(propMap, user, folder, contentStreamNew, policies, aclAdd, aclRemove);
-            so = doc;
+            createdDoc = doc;
         }
 
-        return so;
+        return createdDoc;
     }
 
     private Folder createFolderIntern(CallContext context, String repositoryId, Properties properties, String folderId,
@@ -1112,7 +1110,7 @@ public class InMemoryObjectServiceImpl e
     private StoredObject createItemIntern(CallContext context, String repositoryId, Properties properties,
             String folderId, List<String> policies, Acl addAces, Acl removeAces, ExtensionsData extension) {
 
-        validator.createItem(context, repositoryId, properties, folderId, policies, addAces, removeAces, extension);
+        StoredObject so = validator.createItem(context, repositoryId, properties, folderId, policies, addAces, removeAces, extension);
 
         Acl aclAdd = org.apache.chemistry.opencmis.inmemory.TypeValidator.expandAclMakros(context.getUsername(),
                 addAces);
@@ -1138,8 +1136,6 @@ public class InMemoryObjectServiceImpl e
 
         Folder folder = null;
         if (null != folderId) {
-            StoredObject so = objectStore.getObjectById(folderId);
-
             if (null == so) {
                 throw new CmisInvalidArgumentException(" Cannot create item, folderId: " + folderId + " is invalid");
             }
@@ -1179,11 +1175,11 @@ public class InMemoryObjectServiceImpl e
             user = UNKNOWN_USER;
         }
 
-        StoredObject so = null;
+        StoredObject item = null;
 
         // Now we are sure to have document type definition:
-        so = objectStore.createItem(name, propMapNew, user, folder, policies, aclAdd, aclRemove);
-        return so;
+        item = objectStore.createItem(name, propMapNew, user, folder, policies, aclAdd, aclRemove);
+        return item;
     }
 
     private boolean hasDescendant(String user, ObjectStore objStore, Folder sourceFolder, Folder targetFolder) {