You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2012/09/12 15:24:10 UTC
[7/37] git commit: Closing open transactions from SecurityGroupWorkDao
Closing open transactions from SecurityGroupWorkDao
reviewed-by : Prachi Damle
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/cd77e42a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/cd77e42a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/cd77e42a
Branch: refs/heads/master
Commit: cd77e42a715e7f2f3e1509f6de1a1e0521fc4f9d
Parents: 84caa63
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Tue Aug 28 16:07:42 2012 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Wed Sep 12 18:48:33 2012 +0530
----------------------------------------------------------------------
.../security/dao/SecurityGroupWorkDaoImpl.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cd77e42a/server/src/com/cloud/network/security/dao/SecurityGroupWorkDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/security/dao/SecurityGroupWorkDaoImpl.java b/server/src/com/cloud/network/security/dao/SecurityGroupWorkDaoImpl.java
index c859e89..e3dde51 100644
--- a/server/src/com/cloud/network/security/dao/SecurityGroupWorkDaoImpl.java
+++ b/server/src/com/cloud/network/security/dao/SecurityGroupWorkDaoImpl.java
@@ -158,6 +158,7 @@ public class SecurityGroupWorkDaoImpl extends GenericDaoBase<SecurityGroupWorkVO
final List<SecurityGroupWorkVO> vos = lockRows(sc, filter, true);
if (vos.size() == 0) {
+ txn.commit();
return;
}
SecurityGroupWorkVO work = vos.get(0);
@@ -183,6 +184,7 @@ public class SecurityGroupWorkDaoImpl extends GenericDaoBase<SecurityGroupWorkVO
SecurityGroupWorkVO work = lockRow(workId, true);
if (work == null) {
+ txn.commit();
return;
}
work.setStep(step);