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 d9cc78cea27e410c1dce4a8e9d023da4ac528246
Merge: 76f3d0d... ae99b5b...
Author: Filip Drabek <fdrabek(a)dhcp-lab-136.englab.brq.redhat.com>
Date: Wed Nov 24 23:50:23 2010 +0100
Merge branch 'release-3.0.0' of
ssh://git.fedorahosted.org/git/rhq/rhq into
release-3.0.0
commit 76f3d0dcaa6cad7c2491b86f2fd537a98ba56eaf
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 bebf8a4..5c83563 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
@@ -303,13 +303,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();
@@ -430,7 +430,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);