You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by li...@apache.org on 2013/06/24 10:59:46 UTC
git commit: updated refs/heads/4.1 to de25885
Updated Branches:
refs/heads/4.1 e6b5e72e0 -> de2588516
CLOUDSTACK-305. Everytime a SOAP call is made some transactions are rolled back because the transactions are not committed.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/de258851
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/de258851
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/de258851
Branch: refs/heads/4.1
Commit: de2588516b02e5e5dee3061d1dba8d76b0167045
Parents: e6b5e72
Author: Likitha Shetty <li...@citrix.com>
Authored: Mon Jun 24 14:02:19 2013 +0530
Committer: Likitha Shetty <li...@citrix.com>
Committed: Mon Jun 24 14:23:17 2013 +0530
----------------------------------------------------------------------
.../bridge/persist/dao/CloudStackConfigurationDaoImpl.java | 3 ++-
.../bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java | 2 ++
.../com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java | 1 +
awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java | 8 ++++----
awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java | 8 ++++----
awsapi/src/com/cloud/bridge/persist/dao/SHostDaoImpl.java | 8 ++++----
.../com/cloud/bridge/persist/dao/UserCredentialsDaoImpl.java | 1 +
7 files changed, 18 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/de258851/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java
index 6770a9c..bc77ea1 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<CloudStackCon
}
return configItem.getValue();
}finally {
-
+ txn.commit();
+ txn.close();
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/de258851/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java
index f0d05d3..8021eb6 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java
@@ -50,6 +50,7 @@ public class CloudStackSvcOfferingDaoImpl extends GenericDaoBase<CloudStackServi
return findOneBy(sc);
}finally {
+ txn.commit();
txn.close();
}
@@ -68,6 +69,7 @@ public class CloudStackSvcOfferingDaoImpl extends GenericDaoBase<CloudStackServi
return findOneBy(sc);
}finally {
+ txn.commit();
txn.close();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/de258851/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java
index f108a20..506443e 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java
@@ -61,6 +61,7 @@ public class CloudStackUserDaoImpl extends GenericDaoBase<CloudStackUserVO, Stri
}
return cloudSecretKey;
} finally {
+ txn.commit();
txn.close();
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/de258851/awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java
index 67abf81..2223254 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java
@@ -44,10 +44,10 @@ public class MHostDaoImpl extends GenericDaoBase<MHostVO, Long> implements MHost
SearchCriteria<MHostVO> sc = NameSearch.create();
sc.setParameters("MHostKey", hostKey);
return findOneBy(sc);
-
- }finally {
- txn.close();
- }
+ } finally {
+ txn.commit();
+ txn.close();
+ }
}
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/de258851/awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java
index cce0f83..ea7d264 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<OfferingBundleVO, Long> impl
try {
txn.start();
return listAll().size();
- }finally {
+ } finally {
+ txn.commit();
txn.close();
}
@@ -61,8 +62,8 @@ public class OfferingDaoImpl extends GenericDaoBase<OfferingBundleVO, Long> impl
SearchCriteria<OfferingBundleVO> 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<OfferingBundleVO, Long> impl
SearchCriteria<OfferingBundleVO> 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<OfferingBundleVO, Long> impl
offering = persist(offering);
else
update(offering.getID(), offering);
-
txn.commit();
} finally {
txn.close();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/de258851/awsapi/src/com/cloud/bridge/persist/dao/SHostDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/SHostDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/SHostDaoImpl.java
index 5eadd06..9b6b535 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<SHostVO, Long> implements SHost
SearchCriteria<SHostVO> 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<SHostVO, Long> implements SHost
sc.setParameters("MHostID", mhostId);
sc.setParameters("ExportRoot", storageRoot);
return findOneBy(sc);
-
- }finally {
+ } finally {
+ txn.commit();
txn.close();
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/de258851/awsapi/src/com/cloud/bridge/persist/dao/UserCredentialsDaoImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/UserCredentialsDaoImpl.java b/awsapi/src/com/cloud/bridge/persist/dao/UserCredentialsDaoImpl.java
index 684b00b..c45886f 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<UserCredentialsVO, Lo
sc.setParameters("CertUniqueId", certId);
return findOneBy(sc);
}finally {
+ txn.commit();
txn.close();
}