From 20bead6e6a3cc83cc24a5ac817efe8856073b340 Mon Sep 17 00:00:00 2001 From: Richard Millet Date: Wed, 11 Dec 2013 16:58:44 -0800 Subject: [PATCH] CSPACE-6282: Resolving a misc merge conflict. --- .../collectionspace/services/client/test/BlobScaleTest.java | 5 +++-- .../src/main/resources/collectionspace-client.properties | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) 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 53bd27c0f..e54709a13 100644 --- 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 { try { profiler.stop(); assertStatusCode(res, testName); - logger.debug( + + logger.debug( i + ": Uploaded image to Nuxeo in " + profiler.getCumulativeTime() + " milleseconds " @@ -112,8 +113,8 @@ public class BlobScaleTest extends BaseServiceTest { + jpegFile.getAbsolutePath()); String csid = extractId(res); - //allResourceIdsCreated.add(csid); this.knownResourceId = csid; + allResourceIdsCreated.add(csid); } finally { if (res != null) { res.releaseConnection(); diff --git a/services/client/src/main/resources/collectionspace-client.properties b/services/client/src/main/resources/collectionspace-client.properties index fdd62512d..cdeb3d00c 100644 --- 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 cspace.tenant=1 # the tenantID of the numbered tenant: -cspace.tenantID=core.collectionspace.org +cspace.tenantID=core.collectionspace.org \ No newline at end of file -- 2.47.3