From ddba84ca4e73618d56f37d73ea9e2663f42eed35 Mon Sep 17 00:00:00 2001
From: Richard Millet <remillet@yahoo.com>
Date: Thu, 11 Oct 2018 12:54:34 -0700
Subject: [PATCH] DRYD-480: Needed to retrieve service binding using
 unqualified document type.

---
 .../services/common/config/TenantBindingConfigReaderImpl.java  | 3 ++-
 .../servicegroup/nuxeo/ServiceGroupDocumentModelHandler.java   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/services/common/src/main/java/org/collectionspace/services/common/config/TenantBindingConfigReaderImpl.java b/services/common/src/main/java/org/collectionspace/services/common/config/TenantBindingConfigReaderImpl.java
index 3147500e2..cc4fbdc06 100644
--- a/services/common/src/main/java/org/collectionspace/services/common/config/TenantBindingConfigReaderImpl.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/config/TenantBindingConfigReaderImpl.java
@@ -40,6 +40,7 @@ import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.io.FileUtils;
 import org.collectionspace.services.common.api.JEEServerDeployment;
 import org.collectionspace.services.common.api.Tools;
+import org.collectionspace.services.common.context.ServiceBindingUtils;
 import org.collectionspace.services.config.service.ServiceBindingType;
 import org.collectionspace.services.config.service.ServiceObjectType;
 import org.collectionspace.services.config.tenant.RepositoryDomainType;
@@ -463,7 +464,7 @@ public class TenantBindingConfigReaderImpl extends AbstractConfigReaderImpl<List
 	 * @return
 	 */
 	public ServiceBindingType getServiceBindingForDocType(String tenantId, String docType) {
-		String key = getTenantQualifiedIdentifier(tenantId, docType);
+		String key = getTenantQualifiedIdentifier(tenantId, ServiceBindingUtils.getUnqualifiedTenantDocType(docType)); // REM - must use unqualified document type
 		return docTypes.get(key);
 	}
 
diff --git a/services/servicegroup/service/src/main/java/org/collectionspace/services/servicegroup/nuxeo/ServiceGroupDocumentModelHandler.java b/services/servicegroup/service/src/main/java/org/collectionspace/services/servicegroup/nuxeo/ServiceGroupDocumentModelHandler.java
index 4878c866b..16c435063 100644
--- a/services/servicegroup/service/src/main/java/org/collectionspace/services/servicegroup/nuxeo/ServiceGroupDocumentModelHandler.java
+++ b/services/servicegroup/service/src/main/java/org/collectionspace/services/servicegroup/nuxeo/ServiceGroupDocumentModelHandler.java
@@ -127,7 +127,7 @@ public class ServiceGroupDocumentModelHandler
     	        Map<String, ServiceBindingType> queriedServiceBindings = new HashMap<String, ServiceBindingType>();
     	        DocumentModelList docList = this.getDocListForGroup(ctx, serviceGroupNames, queriedServiceBindings,
     	        		repoSession, repoClient);
-    	        if (docList == null) { // found no authRef fields - nothing to process
+    	        if (docList == null || docList.isEmpty()) { // found no authRef fields - nothing to process
     	            throw new DocumentNotFoundException();
     	        }
     	        DocumentModel docModel = docList.get(0);
-- 
2.47.3