java/code/src/com/redhat/rhn/domain/monitoring/TemplateProbe.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
New commits: commit 20f7b635939fac5045f3f7457ee7bd40e0cb2d6c Author: Tomas Lestach tlestach@redhat.com Date: Thu Oct 18 13:35:10 2012 +0200
prevent NPE, when accessing probe suite systems with no system associated
addressing: java.lang.NullPointerException at com.redhat.rhn.manager.monitoring.MonitoringManager.systemsNotInSuite (MonitoringManager.java:591) at com.redhat.rhn.frontend.action.monitoring.ProbeSuiteSystemsEditSetupA ction.getDataResult(ProbeSuiteSystemsEditSetupAction.java:57) at com.redhat.rhn.frontend.struts.BaseListAction.execute(BaseListAction. java:65) at com.redhat.rhn.frontend.struts.BaseSetListAction.execute(BaseSetListA ction.java:143)
diff --git a/java/code/src/com/redhat/rhn/domain/monitoring/TemplateProbe.java b/java/code/src/com/redhat/rhn/domain/monitoring/TemplateProbe.java index 4fac19a..2a0f6d8 100644 --- a/java/code/src/com/redhat/rhn/domain/monitoring/TemplateProbe.java +++ b/java/code/src/com/redhat/rhn/domain/monitoring/TemplateProbe.java @@ -111,7 +111,10 @@ public class TemplateProbe extends Probe { Set retval = new HashSet(); while (i.hasNext()) { ServerProbe p = (ServerProbe) i.next(); - retval.add(p.getServer()); + Server s = p.getServer(); + if (s != null) { + retval.add(p.getServer()); + } } return retval; }
spacewalk-commits@lists.fedorahosted.org