modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java | 18 +++++++--- 1 file changed, 14 insertions(+), 4 deletions(-)
New commits: commit 3a5aab6588c68bab424a0269942aa11e2a602b92 Author: John Mazzitelli mazz@redhat.com Date: Tue May 3 16:10:45 2011 -0400
BZ 701774 - ignore when a condition value cannot be converted to a Double - its probably a trait and can't be converted anyway
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java index 6475640..b3574bc 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java @@ -374,8 +374,13 @@ public class AlertDataSource extends RPCDataSource<Alert, AlertCriteria> { conditionText = AlertFormatUtility.formatAlertConditionForDisplay(condition); conditionValue = conditionLog.getValue(); if (condition.getMeasurementDefinition() != null) { - conditionValue = MeasurementConverterClient.format(Double.valueOf(conditionLog.getValue()), condition - .getMeasurementDefinition().getUnits(), true); + try { + conditionValue = MeasurementConverterClient.format(Double.valueOf(conditionLog.getValue()), + condition.getMeasurementDefinition().getUnits(), true); + } catch (Exception e) { + // the condition log value was probably not a number (most likely a trait). Ignore this exception. + // even if any other errors occur trying to format the value, ignore this and just use the raw value string + } } } else { conditionText = MSG.view_alerts_field_condition_text_none(); @@ -393,8 +398,13 @@ public class AlertDataSource extends RPCDataSource<Alert, AlertCriteria> { dc.setAttribute("text", AlertFormatUtility.formatAlertConditionForDisplay(condition)); String value = log.getValue(); if (condition.getMeasurementDefinition() != null) { - value = MeasurementConverterClient.format(Double.valueOf(log.getValue()), condition - .getMeasurementDefinition().getUnits(), true); + try { + value = MeasurementConverterClient.format(Double.valueOf(log.getValue()), condition + .getMeasurementDefinition().getUnits(), true); + } catch (Exception e) { + // the condition log value was probably not a number (most likely a trait). Ignore this exception. + // even if any other errors occur trying to format the value, ignore this and just use the raw value string + } } dc.setAttribute("value", value); conditions[i++] = dc;
rhq-commits@lists.fedorahosted.org