java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 7 ++++++-
java/spacewalk-java.spec | 5 ++++-
rel-eng/comps/comps-spacewalk-server-fedora13.xml | 1 -
rel-eng/packages/spacewalk-java | 2 +-
4 files changed, 11 insertions(+), 4 deletions(-)
New commits:
commit 02171b9f3798f2c6b75cff1942c3437e0f4a2dac
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Dec 22 16:01:03 2010 +0100
Automatic commit of package [spacewalk-java] release [1.3.32-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 8c596ff..6741550 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.31
+Version: 1.3.32
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -456,6 +456,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Dec 22 2010 Tomas Lestach <tlestach(a)redhat.com> 1.3.32-1
+- 640928 - convert List<Integer> serverIds to List<Long>
(tlestach(a)redhat.com)
+
* Tue Dec 21 2010 Jan Pazdziora 1.3.31-1
- Rewrite remove_unowned_errata and remove_nonrhn_unowned_errata not to use
rowid.
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index f2b9631..c955716 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.3.31-1 java/
+1.3.32-1 java/
commit 5c6d0f3172fcdca912389d1cd87496070d029014
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Dec 22 15:39:45 2010 +0100
removing rhnlib from server fedora13 comps
correct version of rhnlib landed into offical f13 updates repo
diff --git a/rel-eng/comps/comps-spacewalk-server-fedora13.xml
b/rel-eng/comps/comps-spacewalk-server-fedora13.xml
index 7c678a4..d9a8b9c 100644
--- a/rel-eng/comps/comps-spacewalk-server-fedora13.xml
+++ b/rel-eng/comps/comps-spacewalk-server-fedora13.xml
@@ -60,7 +60,6 @@
<packagereq type="default">quartz</packagereq>
<packagereq type="default">quartz-oracle</packagereq>
<packagereq type="default">redstone-xmlrpc</packagereq>
- <packagereq type="default">rhnlib</packagereq>
<packagereq type="default">rhnpush</packagereq>
<packagereq type="default">SatConfig-bootstrap</packagereq>
<packagereq
type="default">SatConfig-bootstrap-server</packagereq>
commit fd2fbec691f6b80a15d049eff2f15ca26039ed67
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Dec 21 17:27:52 2010 +0100
640928 - convert List<Integer> serverIds to List<Long>
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
index f1fb7db..7e40a89 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
@@ -4682,8 +4682,13 @@ public class SystemHandler extends BaseHandler {
if (cf == null) {
throw new InvalidEntitlementException();
}
+ // we need long values to pass
+ List<Long> longServerIds = new ArrayList();
+ for (Iterator it = serverIds.iterator(); it.hasNext();) {
+ longServerIds.add(new Long((Integer) it.next()));
+ }
return VirtualizationEntitlementsManager.getInstance().
- convertToFlex(serverIds, cf.getId(), user).size();
+ convertToFlex(longServerIds, cf.getId(), user).size();
}
/**