From: remillet <remillet@yahoo.com>
Date: Sat, 13 May 2017 00:22:49 +0000 (-0700)
Subject: CSPACE-7079: More updates and fixes related to new botgarden and anthro profiles.
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=0f7f8ca6c045f0b3b38ba9970163c35c15e389ee;p=tmp%2Fjakarta-migration.git

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 68cb1432a..78570530c 100644
--- 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 eba6ea56f..735a86efc 100644
--- 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 96deb1784..d4433426b 100644
--- 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 e8a213641..60ceabd8b 100644
--- 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;
     }