cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From likit...@apache.org
Subject git commit: updated refs/heads/master-6-17-stable to f00ebad
Date Mon, 24 Jun 2013 08:59:10 GMT
Updated Branches:
  refs/heads/master-6-17-stable 383e4e712 -> f00ebad1c


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/f00ebad1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f00ebad1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f00ebad1

Branch: refs/heads/master-6-17-stable
Commit: f00ebad1c526eee12804809fc4ccaa5cadbc7f2a
Parents: 383e4e7
Author: Likitha Shetty <likitha.shetty@citrix.com>
Authored: Mon Jun 24 14:02:19 2013 +0530
Committer: Likitha Shetty <likitha.shetty@citrix.com>
Committed: Mon Jun 24 14:22:13 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/f00ebad1/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/f00ebad1/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/f00ebad1/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 5aac396..f7e1da6 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java
@@ -55,6 +55,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/f00ebad1/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/f00ebad1/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/f00ebad1/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/f00ebad1/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();
 	    }
 	    


Mime
View raw message