java/code/src/com/redhat/rhn/manager/satellite/test/ConfigureSatelliteCommandTest.java |
2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 40cd9384165871dd4ae7b9ddace775a7b1efc896
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Mon Sep 2 14:06:38 2013 +0200
Broken null check
diff --git
a/java/code/src/com/redhat/rhn/manager/satellite/test/ConfigureSatelliteCommandTest.java
b/java/code/src/com/redhat/rhn/manager/satellite/test/ConfigureSatelliteCommandTest.java
index 575688c..28904d0 100644
---
a/java/code/src/com/redhat/rhn/manager/satellite/test/ConfigureSatelliteCommandTest.java
+++
b/java/code/src/com/redhat/rhn/manager/satellite/test/ConfigureSatelliteCommandTest.java
@@ -111,7 +111,7 @@ public class ConfigureSatelliteCommandTest extends
BaseTestCaseWithUser {
Boolean.FALSE.toString());
// Delete the Scout so we can have the script re-set it up.
- if (user.getOrg().getMonitoringScouts() != null ||
+ if (user.getOrg().getMonitoringScouts() != null &&
user.getOrg().getMonitoringScouts().size() != 0) {
SatCluster cluster = (SatCluster)
user.getOrg().getMonitoringScouts().iterator().next();
Show replies by date