CSPACE-333: Fixed by checking to see if the 'URL_PROPERTY' prop was set. If so,...

diff --git a/services/client/src/main/java/org/collectionspace/services/client/CollectionSpaceClient.java b/services/client/src/main/java/org/collectionspace/services/client/CollectionSpaceClient.java
index af6f4b37e6c8d29a0ed134f3cc29b8e6587a29e9..9405689036b5a113d5ba7f31538dfc9df2d8bf1c 100644 (file)
--- a/services/client/src/main/java/org/collectionspace/services/client/CollectionSpaceClient.java
+++ b/services/client/src/main/java/org/collectionspace/services/client/CollectionSpaceClient.java
@@ -35,9 +35,9 @@ public abstract class CollectionSpaceClient {
 \r
     protected CollectionSpaceClient() {\r
 \r
-        String url = System.getProperty(URL_PROPERTY, DEFAULT_URL);\r
-        if(url != null){\r
-            baseURL = url;\r
+        String urlProperty = System.getProperty(URL_PROPERTY, DEFAULT_URL);\r
+        if(urlProperty != null){\r
+            baseURL = urlProperty;\r
         }\r
         useAuth = Boolean.getBoolean(AUTH_PROPERTY);\r
         if(useAuth){\r
@@ -65,7 +65,12 @@ public abstract class CollectionSpaceClient {
         if(logger.isDebugEnabled()){\r
             logger.debug("useSSL=" + useSSL);\r
         }\r
-        baseURL = useSSL ? DEFAULT_SSL_URL : DEFAULT_URL;\r
+        \r
+        // if the urlProperty prop is set, then it overrides.\r
+        if (urlProperty == null) {\r
+               baseURL = useSSL ? DEFAULT_SSL_URL : DEFAULT_URL;\r
+        }\r
+        \r
         if(logger.isDebugEnabled()){\r
             logger.debug("using baseURL=" + baseURL);\r
         }\r