From 9c19651c8d45cf22ab61a6e202bc49b6fc287ea0 Mon Sep 17 00:00:00 2001 From: "ruben.vargas" Date: Tue, 15 Mar 2016 10:38:04 -0600 Subject: [PATCH] Bug 1218129 - Calltime metrics sort does not work properly --- .../resource/detail/monitoring/CalltimeDataSource.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/monitoring/CalltimeDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/monitoring/CalltimeDataSource.java index 540fbc5e2cb..3e91f9b574d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/monitoring/CalltimeDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/monitoring/CalltimeDataSource.java @@ -33,7 +33,6 @@ import org.rhq.core.domain.criteria.CallTimeDataCriteria; import org.rhq.core.domain.measurement.MeasurementUnits; import org.rhq.core.domain.measurement.calltime.CallTimeDataComposite; -import org.rhq.core.domain.measurement.composite.MeasurementNumericValueAndUnits; import org.rhq.core.domain.util.PageList; import org.rhq.coregui.client.CoreGUI; import org.rhq.coregui.client.gwt.GWTServiceLookup; @@ -136,10 +135,10 @@ public ListGridRecord copyValues(CallTimeDataComposite from) { double[] durations = new double[] { from.getMinimum(), from.getMaximum(), from.getAverage() }; String[] durationStrings = MeasurementConverterClient.formatToSignificantPrecision(durations, MeasurementUnits.MILLISECONDS, true); + // total is the sum of all calls so we format it differently as min, max because it is // much higher number - MeasurementNumericValueAndUnits total = MeasurementConverterClient.fit(from.getTotal(), - MeasurementUnits.MILLISECONDS); + String totalString = MeasurementConverterClient.format(from.getTotal(), MeasurementUnits.MILLISECONDS, true); ListGridRecord record = new ListGridRecord(); @@ -148,7 +147,7 @@ public ListGridRecord copyValues(CallTimeDataComposite from) { record.setAttribute(FIELD_MIN, durations[0]); record.setAttribute(FIELD_MAX, durations[1]); record.setAttribute(FIELD_AVG, durations[2]); - record.setAttribute(FIELD_TOTAL, total.getValue()); + record.setAttribute(FIELD_TOTAL, from.getTotal()); record.setAttribute(FIELD_MIN_STRING, durationStrings[0]); record.setAttribute(FIELD_MAX_STRING, durationStrings[1]); record.setAttribute(FIELD_AVG_STRING, durationStrings[2]);