From 47296e64ac38cf54f4903923cdbb599deea2ac63 Mon Sep 17 00:00:00 2001 From: anthony Date: Wed, 6 Jul 2011 18:57:36 -0700 Subject: [PATCH] bug 10587: correctly use transaction status 10587: resolved fixed Conflicts: server/src/com/cloud/storage/StorageManagerImpl.java --- server/src/com/cloud/storage/StorageManagerImpl.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java index aa2804eb5d8..11131420bc8 100755 --- a/server/src/com/cloud/storage/StorageManagerImpl.java +++ b/server/src/com/cloud/storage/StorageManagerImpl.java @@ -2039,9 +2039,6 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag boolean restart = true; StoragePoolVO primaryStorage = null; try { - Transaction txn = Transaction.currentTxn(); - txn.start(); - // 1. Get the primary storage record and perform validation check primaryStorage = _storagePoolDao.lockRow(primaryStorageId, true); @@ -2098,9 +2095,6 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag } } - txn.commit(); - txn.close(); - // 4. Process the queue List pendingWork = _storagePoolWorkDao.listPendingWorkForPrepareForMaintenanceByPoolId(primaryStorageId);