From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Fri, 26 Apr 2013 21:11:48 +0000 (-0700)
Subject: CSPACE-5763: Fix merge that went awry.
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=edd81fb275108c3a66da59de06e7aa786472f1ad;p=tmp%2Fjakarta-migration.git

CSPACE-5763: Fix merge that went awry.
---

diff --git a/services/common/src/main/java/org/collectionspace/services/common/context/ServiceBindingUtils.java b/services/common/src/main/java/org/collectionspace/services/common/context/ServiceBindingUtils.java
index 01901f1ee..0031dbdeb 100644
--- a/services/common/src/main/java/org/collectionspace/services/common/context/ServiceBindingUtils.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/context/ServiceBindingUtils.java
@@ -189,26 +189,6 @@ public class ServiceBindingUtils {
     	try {
             Object obj = docModel.getPropertyValue(propName);
             return DocumentUtils.propertyValueAsString(obj, docModel, propName);
-                return "";
-            }
-            if (String.class.isAssignableFrom(obj.getClass())) {
-                return (String)obj;
-            } else {
-                // Handle cases where a property value returned from the repository
-                // can't be directly cast to a String.
-                //
-                // FIXME: We may want to create a new utility method to centralize
-                // our handling of these cases, as similar conversions might currently
-                // be performed in multiple classes. - ADR 2013-04-25
-                if (obj instanceof GregorianCalendar) {
-                    return GregorianCalendarDateTimeUtils.formatAsISO8601Timestamp((GregorianCalendar)obj);
-                } else {
-                    logger.warn("Could not convert value of property " + propName
-                            + " in path " + docModel.getPathAsString() + " to a String.");
-                    logger.warn("This may be due to a new, as-yet-unhandled datatype returned from the repository");
-                   return "";
-                }
-            }
     	} catch(IndexOutOfBoundsException ioobe) {
 				// Should not happen, but may with certain array forms
 				if(logger.isTraceEnabled()) {