From 1a7f5244ea4a314da7505d25e5f0ea5850a5aa0f Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Thu, 19 Jan 2006 12:22:54 +0000 Subject: [PATCH] Removed rollback calls within bootstrap as it was rolling back the entire transaction state and therefore not allowing any tests to get started git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2145 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../java/org/alfresco/repo/importer/ImporterBootstrap.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/source/java/org/alfresco/repo/importer/ImporterBootstrap.java b/source/java/org/alfresco/repo/importer/ImporterBootstrap.java index 78eec9c2e9..0ff5e80c74 100644 --- a/source/java/org/alfresco/repo/importer/ImporterBootstrap.java +++ b/source/java/org/alfresco/repo/importer/ImporterBootstrap.java @@ -42,7 +42,6 @@ import org.alfresco.service.cmr.view.ImporterException; import org.alfresco.service.cmr.view.ImporterProgress; import org.alfresco.service.cmr.view.ImporterService; import org.alfresco.service.cmr.view.Location; -import org.alfresco.service.cmr.view.ImporterBinding.UUID_BINDING; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; @@ -275,14 +274,11 @@ public class ImporterBootstrap { if (logger.isDebugEnabled()) logger.debug("Store exists - bootstrap ignored: " + storeRef); - - userTransaction.rollback(); } else if (!allowWrite) { // we're in read-only node logger.warn("Store does not exist, but mode is read-only: " + storeRef); - userTransaction.rollback(); } else { @@ -334,9 +330,8 @@ public class ImporterBootstrap importerService.importView(viewReader, importLocation, binding, new BootstrapProgress()); } } - - userTransaction.commit(); } + userTransaction.commit(); } catch(Throwable e) {