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
This commit is contained in:
Derek Hulley
2006-01-19 12:22:54 +00:00
parent b4550ffa98
commit 1a7f5244ea

View File

@@ -42,7 +42,6 @@ import org.alfresco.service.cmr.view.ImporterException;
import org.alfresco.service.cmr.view.ImporterProgress; import org.alfresco.service.cmr.view.ImporterProgress;
import org.alfresco.service.cmr.view.ImporterService; import org.alfresco.service.cmr.view.ImporterService;
import org.alfresco.service.cmr.view.Location; 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.NamespaceService;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import org.alfresco.service.transaction.TransactionService; import org.alfresco.service.transaction.TransactionService;
@@ -275,14 +274,11 @@ public class ImporterBootstrap
{ {
if (logger.isDebugEnabled()) if (logger.isDebugEnabled())
logger.debug("Store exists - bootstrap ignored: " + storeRef); logger.debug("Store exists - bootstrap ignored: " + storeRef);
userTransaction.rollback();
} }
else if (!allowWrite) else if (!allowWrite)
{ {
// we're in read-only node // we're in read-only node
logger.warn("Store does not exist, but mode is read-only: " + storeRef); logger.warn("Store does not exist, but mode is read-only: " + storeRef);
userTransaction.rollback();
} }
else else
{ {
@@ -334,9 +330,8 @@ public class ImporterBootstrap
importerService.importView(viewReader, importLocation, binding, new BootstrapProgress()); importerService.importView(viewReader, importLocation, binding, new BootstrapProgress());
} }
} }
userTransaction.commit();
} }
userTransaction.commit();
} }
catch(Throwable e) catch(Throwable e)
{ {