[rhq] Branch 'jsanda/metrics-rhq' - modules/core

[John Sanda]

modules/core/domain/src/main/java/org/rhq/core/domain/criteria/MeasurementDataTraitCriteria.java
|    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8f515fc51eb2191fc2dca40527946318fa1e61e0
Author: John Sanda <jsanda(a)redhat.com&gt;
Date:   Wed Jun 27 01:10:30 2012 -0400

    fixing bug where I was returning group id filter instead of resource id filter.

diff --git
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/MeasurementDataTraitCriteria.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/MeasurementDataTraitCriteria.java
index b4b44b2..fa8c597 100644
---
a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/MeasurementDataTraitCriteria.java
+++
b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/MeasurementDataTraitCriteria.java
@@ -115,7 +115,7 @@ public class MeasurementDataTraitCriteria extends Criteria implements
TraitMeasu
 
     @Override
     public Integer getFilterResourceId() {
-        return filterGroupId;
+        return filterResourceId;
     }
 
     public void addFilterDefinitionId(Integer filterDefinitionId) {