modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java
| 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 3300dff0ec830f6b4f5295240cebea76a6a00a38
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Wed Dec 14 15:46:58 2011 -0500
[BZ 760139] have live data requests return empty lists even when random runtime
exceptions occur to avoid serialization issues in UI.
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java
index a57f522..7ffb8e1 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java
@@ -724,8 +724,8 @@ public class MeasurementDataManagerBean implements
MeasurementDataManagerLocal,
List<List<MeasurementDataNumericHighLowComposite>>
findDataForCompatibleGroup(Subject subject, int groupId,
int definitionId, long beginTime, long endTime, int numPoints) {
- List<List<MeasurementDataNumericHighLowComposite>> ret =
findDataForContext(subject, EntityContext
- .forGroup(groupId), definitionId, beginTime, endTime, numPoints);
+ List<List<MeasurementDataNumericHighLowComposite>> ret =
findDataForContext(subject,
+ EntityContext.forGroup(groupId), definitionId, beginTime, endTime,
numPoints);
return ret;
}
@@ -790,6 +790,11 @@ public class MeasurementDataManagerBean implements
MeasurementDataManagerLocal,
AgentClient ac = agentClientManager.getAgentClient(agent);
Set<MeasurementData> values =
ac.getMeasurementAgentService().getRealTimeMeasurementValue(resourceId,
createRequests(definitions));
+ //[BZ 760139] always return non-null value even when there are errors on the
server side. Avoids cryptic
+ // Global UI Exceptions when attempting to serialize null responses.
+ if (values == null) {
+ values = Collections.emptySet();
+ }
return values;
}
Show replies by date