modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java | 10 ++++++++++ 1 file changed, 10 insertions(+)
New commits: commit e60d5bc39ad9c103e072eaa1e8fca7a0aedb9191 Author: Heiko W. Rupp hwr@redhat.com Date: Mon Feb 22 21:35:49 2010 +0100
If no emails failed, we can set the state to success
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java index ff4025f..c21bf21 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java @@ -739,6 +739,16 @@ public class AlertManagerBean implements AlertManagerLocal, AlertManagerRemote { } if (anl.getResultState()==ResultState.FAILED_EMAIL) anl.setBadEmails(StringUtils.getListAsString(badList,",")); + if (anl.getResultState()==ResultState.DEFERRED_EMAIL && badList.isEmpty()) + anl.setResultState(ResultState.SUCCESS); + } + } + else { // No bad addresses + // Only set the result state to success for email sending notifications + // We must not set them if the notification failed. + for (AlertNotificationLog anl : alert.getAlertNotificationLogs()) { + if (anl.getResultState()==ResultState.DEFERRED_EMAIL) + anl.setResultState(ResultState.SUCCESS); } }
rhq-commits@lists.fedorahosted.org