java/code/src/com/redhat/rhn/common/db/datasource/xml/scap_queries.xml | 2 - java/code/src/com/redhat/rhn/manager/audit/ScapManager.java | 13 +++++----- 2 files changed, 8 insertions(+), 7 deletions(-)
New commits: commit 301f99da7c428f5547ac3559f69bcad8c0b6af64 Author: Simon Lukasik slukasik@redhat.com Date: Tue Mar 20 13:00:35 2012 +0100
Ensure the comparison uses correct type
Addressing the issue with id=128, where the condition was never true.
diff --git a/java/code/src/com/redhat/rhn/manager/audit/ScapManager.java b/java/code/src/com/redhat/rhn/manager/audit/ScapManager.java index 9292817..e7cddb2 100644 --- a/java/code/src/com/redhat/rhn/manager/audit/ScapManager.java +++ b/java/code/src/com/redhat/rhn/manager/audit/ScapManager.java @@ -79,7 +79,8 @@ public class ScapManager extends BaseManager { List<Map<String, Object>> resultView = new ArrayList<Map<String, Object>>(); Map<String, Object> currResult = null; for (Map row : (DataResult<Map>) testResultsRaw) { - if (currResult != null && currResult.get("id") == row.get("id")) { + if (currResult != null && + ((Long) currResult.get("id")).equals((Long) row.get("id"))) { String label = (String) row.get("label"); Long figure = (Long) row.get("figure"); currResult.put(label, figure);
commit 609eaafc00edd3c5a28b460fb6b7cbfb84a8d07d Author: Simon Lukasik slukasik@redhat.com Date: Tue Mar 20 10:05:19 2012 +0100
Set column name explicitly, because it varies by db backend.
Oracle sets the column name to COUNT(*), PostgreSQL to COUNT.
Addressing: ERROR org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/rhn].[action] - Servlet.service() for servlet action threw exception java.lang.NullPointerException at com.redhat.rhn.manager.audit.ScapManager.transposeView(ScapManager.java:73) at com.redhat.rhn.manager.audit.ScapManager.allScans(ScapManager.java:62) at com.redhat.rhn.frontend.action.systems.audit.ListScapAction.getResult(ListScapAction.java:60) at com.redhat.rhn.frontend.taglibs.list.helper.ListHelper.setupDataSet(ListHelper.java:107) at com.redhat.rhn.frontend.taglibs.list.helper.ListHelper.execute(ListHelper.java:100) at com.redhat.rhn.frontend.action.systems.audit.ListScapAction.execute(ListScapAction.java:50)
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/scap_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/scap_queries.xml index aa9f1bd..c30a097 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/scap_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/scap_queries.xml @@ -14,7 +14,7 @@
<mode name="show_system_scans"> <query params="sid"> - SELECT tr.id, tr.identifier as test_result, rrt.label, count(*), + SELECT tr.id, tr.identifier as test_result, rrt.label, count(*) as figure, TO_CHAR(sa.completion_time, 'YYYY-MM-DD HH24:MI:SS') AS completion_time FROM rhnXccdfTestresult tr, rhnXccdfRuleresult rr, diff --git a/java/code/src/com/redhat/rhn/manager/audit/ScapManager.java b/java/code/src/com/redhat/rhn/manager/audit/ScapManager.java index ac00463..9292817 100644 --- a/java/code/src/com/redhat/rhn/manager/audit/ScapManager.java +++ b/java/code/src/com/redhat/rhn/manager/audit/ScapManager.java @@ -81,9 +81,9 @@ public class ScapManager extends BaseManager { for (Map row : (DataResult<Map>) testResultsRaw) { if (currResult != null && currResult.get("id") == row.get("id")) { String label = (String) row.get("label"); - Long count = (Long) row.get("count"); - currResult.put(label, count); - currResult.put("sum", ((Long) currResult.get("sum")) + count); + Long figure = (Long) row.get("figure"); + currResult.put(label, figure); + currResult.put("sum", ((Long) currResult.get("sum")) + figure); } else { if (currResult != null) { @@ -92,8 +92,8 @@ public class ScapManager extends BaseManager { currResult = new HashMap<String, Object>(); currResult.put("id", row.get("id")); currResult.put("testResult", row.get("test_result")); - currResult.put((String) row.get("label"), row.get("count")); - currResult.put("sum", row.get("count")); + currResult.put((String) row.get("label"), row.get("figure")); + currResult.put("sum", row.get("figure")); currResult.put("completionTime", row.get("completion_time")); } }
spacewalk-commits@lists.fedorahosted.org