CSPACE-6282: Resolving a misc merge conflict.

diff --git a/services/blob/client/src/test/java/org/collectionspace/services/client/test/BlobScaleTest.java b/services/blob/client/src/test/java/org/collectionspace/services/client/test/BlobScaleTest.java
index 53bd27c0f7feddb6a603fd5d2bda8614d7dafb76..e54709a13db72818d7238fee90b512fe7466c810 100644 (file)
--- a/services/blob/client/src/test/java/org/collectionspace/services/client/test/BlobScaleTest.java
+++ b/services/blob/client/src/test/java/org/collectionspace/services/client/test/BlobScaleTest.java
@@ -103,7 +103,8 @@ public class BlobScaleTest extends BaseServiceTest<AbstractCommonList> {
                        try {\r
                                profiler.stop();\r
                        assertStatusCode(res, testName);\r
-                               logger.debug(\r
+\r
+                       logger.debug(\r
                                                i + ": Uploaded image to Nuxeo in "\r
                                                + profiler.getCumulativeTime()\r
                                                + " milleseconds "\r
@@ -112,8 +113,8 @@ public class BlobScaleTest extends BaseServiceTest<AbstractCommonList> {
                                                + jpegFile.getAbsolutePath());\r
                                \r
                        String csid = extractId(res);\r
-                       //allResourceIdsCreated.add(csid);\r
                        this.knownResourceId = csid;\r
+                       allResourceIdsCreated.add(csid);\r
                        } finally {\r
                                if (res != null) {\r
                     res.releaseConnection();\r

diff --git a/services/client/src/main/resources/collectionspace-client.properties b/services/client/src/main/resources/collectionspace-client.properties
index fdd62512d6280025276a91ed7b3a7dce11a64fcf..cdeb3d00c15868a217cd5a5f24eb68f5de6acafb 100644 (file)
--- a/services/client/src/main/resources/collectionspace-client.properties
+++ b/services/client/src/main/resources/collectionspace-client.properties
@@ -15,4 +15,4 @@ cspace.password=Administrator
 # default tenant\r
 cspace.tenant=1\r
 # the tenantID of the numbered tenant:\r
-cspace.tenantID=core.collectionspace.org\r
+cspace.tenantID=core.collectionspace.org
\ No newline at end of file