From 8bfd5868cad93d3b4f9bf2c43d59f2db2400bcaf Mon Sep 17 00:00:00 2001
From: Benjamin Phillippe <Benjamin_D_Phillippe@raytheon.com>
Date: Thu, 28 Mar 2013 12:08:57 -0500
Subject: [PATCH] Issue #1802: Eliminated a call to new on StatsDao in
 AggregateManager

Change-Id: I2c52a222746df7e7a0c8f91682268e25e97ae0ce

Former-commit-id: c63337ac3588d18f31d1d22c1128f5e32b7c2cff [formerly ec880b7923f718d0be7e403128d1d7495b5730c5] [formerly ed9cb5f8f685794cf926dfa63bd0286c4d44048d] [formerly 6640a65a516bf8244e6791a3e6e201a6321a3bd9 [formerly ed9cb5f8f685794cf926dfa63bd0286c4d44048d [formerly e9e7f34e87f18120232ed5cc8e00da6cb8bda5d5]]]
Former-commit-id: 6640a65a516bf8244e6791a3e6e201a6321a3bd9
Former-commit-id: 3ca6f8d97c36c44404ce7fb69a9938ea70b43c36 [formerly c4496475a6b256c368fc71e800af7e598107d8f6]
Former-commit-id: af5827f1de4dac7bfbd03bf8667a99ad90d3168a
---
 .../res/spring/edex-process-stats.xml                  |  1 +
 .../com/raytheon/uf/edex/stats/AggregateManager.java   | 10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/edexOsgi/com.raytheon.uf.edex.stats/res/spring/edex-process-stats.xml b/edexOsgi/com.raytheon.uf.edex.stats/res/spring/edex-process-stats.xml
index 4cd31c1f0f..3a30e44f53 100644
--- a/edexOsgi/com.raytheon.uf.edex.stats/res/spring/edex-process-stats.xml
+++ b/edexOsgi/com.raytheon.uf.edex.stats/res/spring/edex-process-stats.xml
@@ -13,6 +13,7 @@
     <bean id="aggregateManager" class="com.raytheon.uf.edex.stats.AggregateManager">
         <constructor-arg value="${stats.period}"/>
         <property name="aggregateDao" ref="aggregateRecordDao"/>
+        <property name="statsRecordDao" ref="statsDao"/>
         <property name="jaxbManager" ref="statsGroupingColumnJaxbManager"/>
     </bean>
 
diff --git a/edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java b/edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
index 58dce9911f..6a25ce9c32 100644
--- a/edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
+++ b/edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
@@ -88,6 +88,8 @@ public class AggregateManager {
 
     private AggregateRecordDao aggregateDao;
 
+    private StatsDao statsRecordDao;
+
     private static final Object[] EMPTY_OBJ_ARR = new Object[0];
 
     private static JAXBManager jaxbManager;
@@ -223,7 +225,6 @@ public class AggregateManager {
     public void scan() throws Exception {
         long t0 = System.currentTimeMillis();
         ConfigLoader configLoader = ConfigLoader.getInstance();
-        StatsDao statsRecordDao = new StatsDao();
 
         Map<String, StatisticsEvent> statsMap = configLoader.getTypeView();
 
@@ -372,8 +373,11 @@ public class AggregateManager {
         this.aggregateDao = aggregateDao;
     }
 
-    public void setJaxbManager(JAXBManager jaxbManager) {
-        this.jaxbManager = jaxbManager;
+    public void setStatsRecordDao(StatsDao statsRecordDao) {
+        this.statsRecordDao = statsRecordDao;
     }
 
+    public void setJaxbManager(JAXBManager jaxbManager) {
+        AggregateManager.jaxbManager = jaxbManager;
+    }
 }