java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java | 2 +-
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit ab2be53e8e5346a426f14516dfec1f31420a0c47
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jul 26 17:59:47 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.118-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 3971b65..b732734 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -23,7 +23,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.117
+Version: 1.8.118
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -614,6 +614,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Jul 26 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.118-1
+- 816454 - do not commit already committed transaction
+
* Thu Jul 26 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.117-1
- log a message when repo sync task is triggered
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index e6b1c77..4f63d72 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.117-1 java/
+1.8.118-1 java/
commit 883b95a7d1dac3819f585e9214291c1e583e079e
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jul 26 17:58:59 2012 +0200
816454 - do not commit already committed transaction
diff --git a/java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java
b/java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java
index 8a0b2a7..147da85 100644
--- a/java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java
+++ b/java/code/src/com/redhat/rhn/common/hibernate/ConnectionManager.java
@@ -319,7 +319,7 @@ class ConnectionManager {
Session session = info.getSession();
try {
Transaction txn = info.getTransaction();
- if (txn != null) {
+ if (txn != null && !txn.wasCommitted() &&
!txn.wasRolledBack()) {
try {
txn.commit();
}