java/code/src/com/redhat/rhn/frontend/dto/ChannelOverview.java | 14 +---------
java/spacewalk-java.spec | 6 +++-
rel-eng/packages/spacewalk-java | 2 -
3 files changed, 8 insertions(+), 14 deletions(-)
New commits:
commit c6e59cc4dfa95124ec543f9890c98b19fca3a23d
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jan 27 17:56:48 2011 +0100
Automatic commit of package [spacewalk-java] release [1.3.51-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 513518e..13ade8a 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.3.50
+Version: 1.3.51
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -531,6 +531,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Jan 27 2011 Tomas Lestach <tlestach(a)redhat.com> 1.3.51-1
+- Revert "671450 - do not set null for maxFlex and maxMembers ChannelOverview
+ attributes" (tlestach(a)redhat.com)
+
* Thu Jan 27 2011 Tomas Lestach <tlestach(a)redhat.com> 1.3.50-1
- removing remains of RhnDaemonState table (tlestach(a)redhat.com)
- Improving spelling script and adding few ignore words (lzap+git(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 23c97c5..ba3c47b 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.3.50-1 java/
+1.3.51-1 java/
commit cffab0bd9315a933d24afc4e8cf9feab7a85929b
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jan 27 17:55:19 2011 +0100
Revert "671450 - do not set null for maxFlex and maxMembers ChannelOverview
attributes"
This reverts commit 2f08c0d2bce55c42ade13ab6ee4caeb7dd6847c1
the fix isn't correct, because null value of maxFlex or maxMembers means unlimited
usage, not 0!
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/ChannelOverview.java
b/java/code/src/com/redhat/rhn/frontend/dto/ChannelOverview.java
index 8355e84..0eb5ae0 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/ChannelOverview.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/ChannelOverview.java
@@ -90,12 +90,7 @@ public class ChannelOverview extends BaseDto implements Comparable {
* @param maxFlexIn The maxFlex to set.
*/
public void setMaxFlex(Long maxFlexIn) {
- if (maxFlexIn == null) {
- this.maxFlex = 0L;
- }
- else {
- this.maxFlex = maxFlexIn;
- }
+ this.maxFlex = maxFlexIn;
}
/**
@@ -229,12 +224,7 @@ public class ChannelOverview extends BaseDto implements Comparable {
* @param maxMembersIn The maxMembers to set.
*/
public void setMaxMembers(Long maxMembersIn) {
- if (maxMembersIn == null) {
- this.maxMembers = 0L;
- }
- else {
- this.maxMembers = maxMembersIn;
- }
+ this.maxMembers = maxMembersIn;
}
/**