From 69b9f216671163e3d9fb92043fe4f5b12b5b3b10 Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Fri, 11 Nov 2011 16:04:57 +0000 Subject: [PATCH] Cater for replicator thread beating test thread git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31908 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../replication/ContentStoreReplicatorTest.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/source/java/org/alfresco/repo/content/replication/ContentStoreReplicatorTest.java b/source/java/org/alfresco/repo/content/replication/ContentStoreReplicatorTest.java index f5253ecf02..2ad636cac5 100644 --- a/source/java/org/alfresco/repo/content/replication/ContentStoreReplicatorTest.java +++ b/source/java/org/alfresco/repo/content/replication/ContentStoreReplicatorTest.java @@ -28,6 +28,7 @@ import org.alfresco.repo.content.ContentContext; import org.alfresco.repo.content.ContentStore; import org.alfresco.repo.content.ContentStore.ContentUrlHandler; import org.alfresco.repo.content.filestore.FileContentStore; +import org.alfresco.service.cmr.repository.ContentIOException; import org.alfresco.service.cmr.repository.ContentWriter; import org.alfresco.util.GUID; import org.alfresco.util.TempFileProvider; @@ -143,10 +144,17 @@ public class ContentStoreReplicatorTest extends TestCase // put some content into both the target and source ContentWriter duplicateSourceWriter = sourceStore.getWriter(ContentStore.NEW_CONTENT_CONTEXT); duplicateUrl = duplicateSourceWriter.getContentUrl(); - ContentContext targetContentCtx = new ContentContext(null, duplicateUrl); - ContentWriter duplicateTargetWriter = targetStore.getWriter(targetContentCtx); - duplicateTargetWriter.putContent("Duplicate Target Content: " + i); - duplicateSourceWriter.putContent(duplicateTargetWriter.getReader()); + try + { + ContentContext targetContentCtx = new ContentContext(null, duplicateUrl); + ContentWriter duplicateTargetWriter = targetStore.getWriter(targetContentCtx); + duplicateTargetWriter.putContent("Duplicate Target Content: " + i); + duplicateSourceWriter.putContent(duplicateTargetWriter.getReader()); + } + catch (ContentIOException e) + { + // This can happen because the replicator may have beaten us to it + } for (int j = 0; j < 100; j++) {