java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 9 +++------
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 4a0705ea4f9eda137987d7eb333efee46ff7ed7a
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 3 10:38:56 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.16-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 98cf901..6e0e3ec 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.5.15
+Version: 1.5.16
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -538,6 +538,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue May 03 2011 Miroslav Suchý 1.5.16-1
+- 673392 - alter channel subscriptions: display flex consumption
+
* Mon May 02 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.15-1
- removing unused imports (tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 1dada0a..95ddb50 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.15-1 java/
+1.5.16-1 java/
commit 18bb9cf274996dff7fbcbce5de7bc030b524a379
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 3 10:37:53 2011 +0200
checkstyle - Line is longer than 92 characters.
diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
index 9897e64..dbc9e92 100644
--- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
@@ -2031,7 +2031,8 @@ public class SystemManager extends BaseManager {
// Not free. Check to see if we're a guest, and there are FVEs available.
// Note that for FVEs, NULL == NOT FOUND
if (isServerFveEligible(serverIn)) {
- Long availableFVEs = ChannelManager.getAvailableFveEntitlements(orgIn,
channelIn);
+ Long availableFVEs = ChannelManager.getAvailableFveEntitlements(orgIn,
+ channelIn);
if (availableFVEs != null && (availableFVEs.longValue() > 0)) {
return true;
}
commit 5ab7dad63e0049fc0acfb5205a26d42fe26b9912
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 3 10:35:38 2011 +0200
code style - Conditional logic can be removed.
diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
index fc5c50a..9897e64 100644
--- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
@@ -2003,12 +2003,7 @@ public class SystemManager extends BaseManager {
Map params = new HashMap();
params.put("sid", serverIn.getId());
- if (m.execute(params).size() >= 1) {
- return true;
- }
- else {
- return false;
- }
+ return (m.execute(params).size() >= 1);
}
commit 1961c4afbda50d218e0f0f603f6c25c30268761f
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 3 10:33:35 2011 +0200
code style - '}' should be alone on a line.
diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
index 358d5c1..fc5c50a 100644
--- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
@@ -2005,7 +2005,8 @@ public class SystemManager extends BaseManager {
if (m.execute(params).size() >= 1) {
return true;
- } else {
+ }
+ else {
return false;
}
}