modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/InventorySummaryHandler.java
| 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 7105848aa93178d40ee87110403dc9b9d4df1c0c
Author: John Sanda <jsanda(a)redhat.com>
Date: Fri Mar 30 12:24:00 2012 -0400
[BZ 800453] fixing error from previous merge conflict
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/InventorySummaryHandler.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/InventorySummaryHandler.java
index 1531b0c..148afe5 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/InventorySummaryHandler.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/InventorySummaryHandler.java
@@ -133,8 +133,8 @@ public class InventorySummaryHandler extends AbstractRestBean
implements Invento
output.write((getHeader() + "," + getDetailsHeader() +
"\n").getBytes());
- // if there are no resource type ids, that means we fetching everything -
all
- // details for all types.
+ // if there are no resource type ids, that means we are fetching everything,
+ // that is all resource details for all types.
if (resourceTypeIds.isEmpty()) {
criteria = getDetailsQueryCriteria(null);
queryExecutor = new CriteriaQueryExecutor<Resource,
ResourceCriteria>() {
@@ -207,7 +207,7 @@ public class InventorySummaryHandler extends AbstractRestBean
implements Invento
}
protected String toCSV(Resource resource) {
- return resource.getName() + "," +
ReportHelper.parseAncestry(resource.getAncestry()) + "," +
+ return resource.getName() + "," +
ReportFormatHelper.parseAncestry(resource.getAncestry()) + "," +
resource.getDescription() + "," +
resource.getResourceType().getName() + "," + resource.getVersion() +
"," + resource.getCurrentAvailability().getAvailabilityType();
}