java/code/src/com/redhat/rhn/domain/channel/ClonedChannel.java | 6 +++++-
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 11 insertions(+), 3 deletions(-)
New commits:
commit 0527641b50e7a3eb8e831d7191d3b379af0fec17
Author: Stephen Herr <sherr(a)redhat.com>
Date: Thu Jul 5 15:53:04 2012 -0400
Automatic commit of package [spacewalk-java] release [1.8.105-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 5d0f0b5..fabf9c5 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.104
+Version: 1.8.105
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -616,6 +616,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Jul 05 2012 Stephen Herr <sherr(a)redhat.com> 1.8.105-1
+- 837913 - work around for if hibernate loads a clonedchannel as its own
+ original
+
* Fri Jun 29 2012 Stephen Herr <sherr(a)redhat.com> 1.8.104-1
- 836656 - Allow user to set MAC Address when provisioning a virtual guest
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 50707cf..1e16238 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.104-1 java/
+1.8.105-1 java/
commit 1e1aaa778a2c9e463b5df8288742bf8907411ccf
Author: Nigel Jones <nigjones(a)redhat.com>
Date: Thu Jul 5 15:51:59 2012 -0400
837913 - work around for if hibernate loads a clonedchannel as its own original
diff --git a/java/code/src/com/redhat/rhn/domain/channel/ClonedChannel.java
b/java/code/src/com/redhat/rhn/domain/channel/ClonedChannel.java
index 2413af9..134aac6 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/ClonedChannel.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/ClonedChannel.java
@@ -42,6 +42,7 @@ public class ClonedChannel extends Channel {
/**
* {@inheritDoc}
*/
+ @Override
public boolean isCloned() {
return true;
}
@@ -51,7 +52,10 @@ public class ClonedChannel extends Channel {
*/
@Override
public ChecksumType getChecksumType() {
- if (super.getChecksumType() == null) {
+ // We can reach a StackOverflow here if the current channel is also the
+ // original. Happening because of a Hibernate problem. See BZ 837913.
+ if (super.getChecksumType() == null &&
+ !super.getLabel().equals(getOriginal().getLabel())) {
// if the checksum type is not set use the
//checksum of original channel instead.
setChecksumType(getOriginal().getChecksumType());