diff --git a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java index 6770a9cc514..bc77ea1d886 100644 --- a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java +++ b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java @@ -54,7 +54,8 @@ public class CloudStackConfigurationDaoImpl extends GenericDaoBase implements MHost SearchCriteria sc = NameSearch.create(); sc.setParameters("MHostKey", hostKey); return findOneBy(sc); - - }finally { - txn.close(); - } + } finally { + txn.commit(); + txn.close(); + } } @Override diff --git a/awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java index cce0f838f88..ea7d264f80c 100644 --- a/awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java +++ b/awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java @@ -43,7 +43,8 @@ public class OfferingDaoImpl extends GenericDaoBase impl try { txn.start(); return listAll().size(); - }finally { + } finally { + txn.commit(); txn.close(); } @@ -61,8 +62,8 @@ public class OfferingDaoImpl extends GenericDaoBase impl SearchCriteria sc = searchByAmazon.create(); sc.setParameters("AmazonEC2Offering", amazonEC2Offering); return findOneBy(sc).getCloudstackOffering(); - } finally { + txn.commit(); txn.close(); } } @@ -79,8 +80,8 @@ public class OfferingDaoImpl extends GenericDaoBase impl SearchCriteria sc = searchByAmazon.create(); sc.setParameters("CloudStackOffering", cloudStackOffering); return findOneBy(sc).getAmazonOffering(); - } finally { + txn.commit(); txn.close(); } } @@ -109,7 +110,6 @@ public class OfferingDaoImpl extends GenericDaoBase impl offering = persist(offering); else update(offering.getID(), offering); - txn.commit(); } finally { txn.close(); diff --git a/awsapi/src/com/cloud/bridge/persist/dao/SHostDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/SHostDaoImpl.java index 5eadd0661c1..9b6b5359759 100644 --- a/awsapi/src/com/cloud/bridge/persist/dao/SHostDaoImpl.java +++ b/awsapi/src/com/cloud/bridge/persist/dao/SHostDaoImpl.java @@ -42,8 +42,8 @@ public class SHostDaoImpl extends GenericDaoBase implements SHost SearchCriteria sc = HostSearch.create(); sc.setParameters("Host", host); return findOneBy(sc); - - }finally { + } finally { + txn.commit(); txn.close(); } @@ -62,8 +62,8 @@ public class SHostDaoImpl extends GenericDaoBase implements SHost sc.setParameters("MHostID", mhostId); sc.setParameters("ExportRoot", storageRoot); return findOneBy(sc); - - }finally { + } finally { + txn.commit(); txn.close(); } } diff --git a/awsapi/src/com/cloud/bridge/persist/dao/UserCredentialsDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/UserCredentialsDaoImpl.java index 684b00b920f..c45886f794c 100644 --- a/awsapi/src/com/cloud/bridge/persist/dao/UserCredentialsDaoImpl.java +++ b/awsapi/src/com/cloud/bridge/persist/dao/UserCredentialsDaoImpl.java @@ -67,6 +67,7 @@ public class UserCredentialsDaoImpl extends GenericDaoBase