modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java
| 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 1bb8940ecd24eb3946d502fc84e6b648af72ffbb
Author: Filip Drabek <fdrabek(a)dhcp-lab-136.englab.brq.redhat.com>
Date: Wed Nov 24 23:49:43 2010 +0100
BZ-642641 fix issue in collecting metrics after metric template update.
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java
index d9b5a3d..602d2c3 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java
@@ -307,13 +307,13 @@ public class MeasurementScheduleManagerBean implements
MeasurementScheduleManage
return;
}
- @RequiredPermissions( { @RequiredPermission(Permission.MANAGE_INVENTORY),
+ @RequiredPermissions({ @RequiredPermission(Permission.MANAGE_INVENTORY),
@RequiredPermission(Permission.MANAGE_SETTINGS) })
public void disableAllDefaultCollections(Subject subject) {
entityManager.createNamedQuery(MeasurementDefinition.DISABLE_ALL).executeUpdate();
}
- @RequiredPermissions( { @RequiredPermission(Permission.MANAGE_INVENTORY),
+ @RequiredPermissions({ @RequiredPermission(Permission.MANAGE_INVENTORY),
@RequiredPermission(Permission.MANAGE_SETTINGS) })
public void disableAllSchedules(Subject subject) {
entityManager.createNamedQuery(MeasurementSchedule.DISABLE_ALL).executeUpdate();
@@ -466,7 +466,7 @@ public class MeasurementScheduleManagerBean implements
MeasurementScheduleManage
// Return only the data necessary to construct minimal objects ourselves.
Using JPQL
// is ok, it just lets Hibernate do the heavy lifting for query
generation.
queryString = "" //
- + "SELECT ms.id, ms.resource.id, ms.definition.name,
ms.definition.dataType, ms.definition.numericType" //
+ + "SELECT ms.id, ms.resource.id, ms.definition.name,
ms.definition.dataType, ms.definition.rawNumericType" //
+ " FROM MeasurementSchedule ms" //
+ " WHERE ms.definition.id IN ( :definitionIds )";
Query query = entityManager.createQuery(queryString);
Show replies by date