diff --git a/server/src/com/cloud/alert/AlertManagerImpl.java b/server/src/com/cloud/alert/AlertManagerImpl.java index 31c0585ac70..b8ccedf2745 100755 --- a/server/src/com/cloud/alert/AlertManagerImpl.java +++ b/server/src/com/cloud/alert/AlertManagerImpl.java @@ -315,8 +315,6 @@ public class AlertManagerImpl implements AlertManager { } catch (Exception ex) { txn.rollback(); s_logger.error("Unable to start transaction for capacity update"); - }finally { - txn.close(); } } diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java index fa46821a81b..345019773da 100755 --- a/server/src/com/cloud/storage/StorageManagerImpl.java +++ b/server/src/com/cloud/storage/StorageManagerImpl.java @@ -1920,7 +1920,6 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag // set the pool state to prepare for maintenance primaryStorage.setStatus(StoragePoolStatus.PrepareForMaintenance); _storagePoolDao.update(primaryStorageId, primaryStorage); - txn.commit(); // check to see if other ps exist // if they do, then we can migrate over the system vms to them @@ -1962,7 +1961,6 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag } txn.commit(); - txn.close(); // 4. Process the queue List pendingWork = _storagePoolWorkDao.listPendingWorkForPrepareForMaintenanceByPoolId(primaryStorageId);