java/code/src/com/redhat/rhn/frontend/action/systems/VirtualSystemsListSetupAction.java |
2 +-
java/spacewalk-java.spec |
6 +++++-
rel-eng/packages/spacewalk-java |
2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 7810ebfd1b861d0d7bb9b1468ce325634077551a
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Mon Jul 22 08:28:58 2013 +0200
Automatic commit of package [spacewalk-java] release [2.1.3-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 450bd4a..0a5101e 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 2.1.2
+Version: 2.1.3
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -771,6 +771,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Jul 22 2013 Jan Dobes 2.1.3-1
+- prevent ISE when UUID and host ID is null
+- ISS: Return LookupException to getDefaultMaster() if there isn't one
+
* Fri Jul 19 2013 Stephen Herr <sherr(a)redhat.com> 2.1.2-1
- 986335 - explicitly require libxml2 for kickstarts to avoid error
- 986299 - use empty_message_key instead of empty_message
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 6507840..8661b1e 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.2-1 java/
+2.1.3-1 java/
commit f57a7a14e359cb447709bc13055c4b56568be5c0
Author: Johannes Renner <jrenner(a)suse.de>
Date: Fri Jul 19 13:39:51 2013 +0200
prevent ISE when UUID and host ID is null
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/systems/VirtualSystemsListSetupAction.java
b/java/code/src/com/redhat/rhn/frontend/action/systems/VirtualSystemsListSetupAction.java
index 308b9db..5252234 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/systems/VirtualSystemsListSetupAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/systems/VirtualSystemsListSetupAction.java
@@ -63,7 +63,7 @@ public class VirtualSystemsListSetupAction extends
BaseSystemListSetupAction {
if (current.isFakeNode()) {
continue;
}
- else if (current.getUuid() == null) {
+ else if (current.getUuid() == null && current.getHostSystemId() !=
null) {
current.setSystemId(current.getHostSystemId());
}
else {