CSPACE-7079: More updates and fixes related to new botgarden and anthro profiles.

diff --git a/3rdparty/nuxeo/nuxeo-platform-listener/updateobjectlocationonmove/src/main/java/org/collectionspace/services/listener/AbstractUpdateObjectLocationValues.java b/3rdparty/nuxeo/nuxeo-platform-listener/updateobjectlocationonmove/src/main/java/org/collectionspace/services/listener/AbstractUpdateObjectLocationValues.java
index 68cb1432a9e628e80848767e06ba9ab493fe49bd..78570530c5b266a5ff38db9a2707e49905b8655a 100644 (file)
--- a/3rdparty/nuxeo/nuxeo-platform-listener/updateobjectlocationonmove/src/main/java/org/collectionspace/services/listener/AbstractUpdateObjectLocationValues.java
+++ b/3rdparty/nuxeo/nuxeo-platform-listener/updateobjectlocationonmove/src/main/java/org/collectionspace/services/listener/AbstractUpdateObjectLocationValues.java
@@ -417,6 +417,10 @@ public abstract class AbstractUpdateObjectLocationValues extends AbstractCSEvent
     protected static DocumentModel getCurrentDocModelFromCsid(CoreSessionInterface session, String csid) {
         DocumentModelList docModelList = null;
         
+        if (Tools.isEmpty(csid)) {
+               return null;
+        }
+        
         try {
             final String query = "SELECT * FROM "
                     + NuxeoUtils.BASE_DOCUMENT_TYPE

diff --git a/services/authentication/service/src/main/java/org/collectionspace/authentication/TomcatShutdownListener.java b/services/authentication/service/src/main/java/org/collectionspace/authentication/TomcatShutdownListener.java
index eba6ea56f007f801d4b53ae4ff4d39b4e877f0aa..735a86efcd8da6d78991f6cb038c5dbfece3f91f 100644 (file)
--- a/services/authentication/service/src/main/java/org/collectionspace/authentication/TomcatShutdownListener.java
+++ b/services/authentication/service/src/main/java/org/collectionspace/authentication/TomcatShutdownListener.java
@@ -39,7 +39,7 @@ public class TomcatShutdownListener implements LifecycleListener {
                        if (failed) {
                                triggerShutdown(isInit, server);
                        } else if (!isInit) {
-                               logger.log(Level.INFO, "CollectionSpace Startup successful.");
+                               logger.log(Level.INFO, "CollectionSpace Startup successful." + "\007" + "\007" + "\007");
                        }
                }
        }

diff --git a/services/batch/service/src/main/java/org/collectionspace/services/batch/BatchResource.java b/services/batch/service/src/main/java/org/collectionspace/services/batch/BatchResource.java
index 96deb17841c119c806a40aefa18d4e62be8a769a..d4433426b84e473b3d129f378132e7329212de9d 100644 (file)
--- a/services/batch/service/src/main/java/org/collectionspace/services/batch/BatchResource.java
+++ b/services/batch/service/src/main/java/org/collectionspace/services/batch/BatchResource.java
@@ -78,7 +78,6 @@ public class BatchResource extends NuxeoBasedResource {
        return BatchCommon.class;
     }
     
-       /**
        // other resource methods and use the getRepositoryClient() methods.
        @Override
     protected AbstractCommonList getCommonList(UriInfo ui) {

diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/util/NuxeoUtils.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/util/NuxeoUtils.java
index e8a213641251b8769e18c1efc1a04043a08ef73b..60ceabd8bce774304001ab3882e1600097da170e 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/util/NuxeoUtils.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/util/NuxeoUtils.java
@@ -508,8 +508,10 @@ public class NuxeoUtils {
        
        if (csid != null) {
                result = "ecm:name = " + "\'" + csid + "\'";
+       } else {
+               logger.error("Call to NuxeoUtils.getByNameWhereClause() with null valued CSID.");
        }
-       
+               
        return result;
     }