xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Issue #1802: Eliminated a call to new on StatsDao in AggregateManager" into development

Browse source 
Former-commit-id: 2ec3e76c1c [formerly 59393b633a] [formerly 8583a5f785] [formerly 51bf00bf1c [formerly 8583a5f785 [formerly bf39f3c73e4de589855abda284c6d2d46543d283]]]
Former-commit-id: 51bf00bf1c
Former-commit-id: 9d4afc316993b2f4357647dcee834eee6af6bfcd [formerly db5a8b9865]
Former-commit-id: ee26b669e3
This commit is contained in:
Dustin Johnson 2013-03-28 12:25:12 -05:00 • committed by Gerrit Code Review
commit a5bb46da22
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
edexOsgi/com.raytheon.uf.edex.stats/res/spring/edex-process-stats.xml
View file

@ -13,6 +13,7 @@
<bean id="aggregateManager" class="com.raytheon.uf.edex.stats.AggregateManager"> <bean id="aggregateManager" class="com.raytheon.uf.edex.stats.AggregateManager">
<constructor-arg value="${stats.period}"/> <constructor-arg value="${stats.period}"/>
<property name="aggregateDao" ref="aggregateRecordDao"/> <property name="aggregateDao" ref="aggregateRecordDao"/>
<property name="statsRecordDao" ref="statsDao"/>
<property name="jaxbManager" ref="statsGroupingColumnJaxbManager"/> <property name="jaxbManager" ref="statsGroupingColumnJaxbManager"/>
</bean> </bean>

10
edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
View file

@ -88,6 +88,8 @@ public class AggregateManager {
private AggregateRecordDao aggregateDao; private AggregateRecordDao aggregateDao;
private StatsDao statsRecordDao;
private static final Object[] EMPTY_OBJ_ARR = new Object[0]; private static final Object[] EMPTY_OBJ_ARR = new Object[0];
private static JAXBManager jaxbManager; private static JAXBManager jaxbManager;
@ -223,7 +225,6 @@ public class AggregateManager {
public void scan() throws Exception { public void scan() throws Exception {
long t0 = System.currentTimeMillis(); long t0 = System.currentTimeMillis();
ConfigLoader configLoader = ConfigLoader.getInstance(); ConfigLoader configLoader = ConfigLoader.getInstance();
StatsDao statsRecordDao = new StatsDao();
Map<String, StatisticsEvent> statsMap = configLoader.getTypeView(); Map<String, StatisticsEvent> statsMap = configLoader.getTypeView();
@ -372,8 +373,11 @@ public class AggregateManager {
this.aggregateDao = aggregateDao; this.aggregateDao = aggregateDao;
} }
public void setJaxbManager(JAXBManager jaxbManager) { public void setStatsRecordDao(StatsDao statsRecordDao) {
this.jaxbManager = jaxbManager; this.statsRecordDao = statsRecordDao;
} }
public void setJaxbManager(JAXBManager jaxbManager) {
AggregateManager.jaxbManager = jaxbManager;
}
} }