modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java | 15 ++++++++-- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java | 2 - 2 files changed, 14 insertions(+), 3 deletions(-)
New commits: commit ac1124b8223ef44ecc19e9839ddede067ee02e13 Author: John Sanda jsanda@redhat.com Date: Fri Aug 30 08:15:14 2013 -0400
[BZ 1002210] fixing regression caused by previous commit for this bug
Now that getSummaryAggregate is not transaction, the schedule's resource association needs to be initialized.
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 c94d61b..8757430 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 @@ -88,6 +88,7 @@ import org.rhq.enterprise.server.agentclient.AgentClient; import org.rhq.enterprise.server.alert.AlertManagerLocal; import org.rhq.enterprise.server.alert.engine.AlertConditionCacheManagerLocal; import org.rhq.enterprise.server.alert.engine.AlertConditionCacheStats; +import org.rhq.enterprise.server.auth.SubjectManagerLocal; import org.rhq.enterprise.server.authz.AuthorizationManagerLocal; import org.rhq.enterprise.server.authz.PermissionException; import org.rhq.enterprise.server.storage.StorageClientManagerBean; @@ -162,6 +163,9 @@ public class MeasurementDataManagerBean implements MeasurementDataManagerLocal, @EJB private MeasurementScheduleManagerLocal measurementScheduleManager;
+ @EJB + private SubjectManagerLocal subjectManager; + // doing a bulk delete in here, need to be in its own tx @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) @TransactionTimeout(6 * 60 * 60) @@ -596,12 +600,19 @@ public class MeasurementDataManagerBean implements MeasurementDataManagerLocal, log.debug(callingMethod + ": " + stats.toString()); }
+ @Override @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED) public MeasurementAggregate getAggregate(Subject subject, int scheduleId, long startTime, long endTime) { - MeasurementSchedule schedule = entityManager.find(MeasurementSchedule.class, scheduleId); - if (schedule == null) { + MeasurementScheduleCriteria criteria = new MeasurementScheduleCriteria(); + criteria.addFilterId(scheduleId); + criteria.fetchResource(true); + + PageList<MeasurementSchedule> schedules = measurementScheduleManager.findSchedulesByCriteria( + subjectManager.getOverlord(), criteria); + if (schedules.isEmpty()) { throw new MeasurementException("Could not fine MeasurementSchedule with the id[" + scheduleId + "]"); } + MeasurementSchedule schedule = schedules.get(0);
if (authorizationManager.canViewResource(subject, schedule.getResource().getId()) == false) { throw new PermissionException("User[" + subject.getName()
commit c14fd37f96ef5acaff25588a7451a52b933a347e Author: John Sanda jsanda@redhat.com Date: Fri Aug 30 07:44:29 2013 -0400
fix name of server jar deployment
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java index b29c8a4..2e90e32 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java @@ -393,7 +393,7 @@ public final class LookupUtil { public static StorageClientManagerBean getStorageClientManager() { try { return (StorageClientManagerBean) new InitialContext().lookup( - "java:global/rhq/rhq-enterprise-server-ejb3/" + StorageClientManagerBean.class.getSimpleName()); + "java:global/rhq/rhq-server/" + StorageClientManagerBean.class.getSimpleName()); } catch (NamingException e) { String msg = "Unable to access " + StorageClientManagerBean.class + " due to JNDI error. You may " + "need to restart the server so that the storage client subsystem can be reinitialized.";
rhq-commits@lists.fedorahosted.org