From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Wed, 30 May 2012 22:48:04 +0000 (-0700)
Subject: CSPACE-5012: Tenant unqualify the docType prior to using it to construct the collecti... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=a175ca56464548865ad102ff01e63612381b0ce5;p=tmp%2Fjakarta-migration.git

CSPACE-5012: Tenant unqualify the docType prior to using it to construct the collectionspace_core:uri value; previous commit to TemplateExpander didn't do this.
---

diff --git a/services/imports/service/src/main/java/org/collectionspace/services/imports/TemplateExpander.java b/services/imports/service/src/main/java/org/collectionspace/services/imports/TemplateExpander.java
index f8d057138..3c7aa9c2d 100644
--- a/services/imports/service/src/main/java/org/collectionspace/services/imports/TemplateExpander.java
+++ b/services/imports/service/src/main/java/org/collectionspace/services/imports/TemplateExpander.java
@@ -158,8 +158,9 @@ public class TemplateExpander {
         // We may have been supplied with the tenant-qualified name
         // of an extension to a document type, and thus need to
         // get the base document type name.
+        docType = ServiceBindingUtils.getUnqualifiedTenantDocType(docType);
         ServiceBindingType sb =
-            tReader.getServiceBindingForDocType(tenantId, ServiceBindingUtils.getUnqualifiedTenantDocType(docType));
+            tReader.getServiceBindingForDocType(tenantId, docType);        
 
         String serviceCategory = sb.getType();
         String uri = "";