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

Merge "Issue #2678 fix for sbn retrieval agent subscription queue. init it as null because sbn ingest is from ingest messages." into omaha_14.2.1

Browse source 
Former-commit-id: 28281b799e [formerly 5a24f67ad9] [formerly bfd3cc7d16 [formerly b0bd165fde6dffc1064ea915440cd8d292eeb0c6]]
Former-commit-id: bfd3cc7d16
Former-commit-id: 5e237af88e
This commit is contained in:
Nate Jensen 2014-01-16 18:28:06 -06:00 • committed by Gerrit Code Review
commit adad7b744c
3 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-edex-impl-wfo.xml
View file

@ -61,9 +61,7 @@
<constructor-arg ref="bandwidthDao" />
<constructor-arg ref="retrievalDao" />
<constructor-arg ref="ProviderHandler" />
<constructor-arg name="retrievalQueue" >
<null/>
</constructor-arg>
<constructor-arg ref="retrievalQueue" />
</bean>
<util:map id="retrievalAgents">

19
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-wfo.xml
View file

@ -16,10 +16,29 @@
</property>
</bean>
<!-- SBN Retrival Plans are defined in the wfo configuration because it is used by the
InMemoryBandwidthManager in the centralRegistry and client registries. They are not
scheduled in the client registries though -->
<bean id="SBNRetrievalPlan"
class="com.raytheon.uf.edex.datadelivery.bandwidth.retrieval.RetrievalPlan">
<property name="network" value="SBN" />
<property name="map" ref="BandwidthMap" />
<property name="bandwidthDao" ref="bandwidthDao" />
<property name="bucketsDao" ref="bandwidthBucketDao" />
<property name="associator" ref="bandwidthBucketAllocationAssociator" />
<property name="scheduler">
<bean
class="com.raytheon.uf.edex.datadelivery.bandwidth.retrieval.PriorityRetrievalScheduler" />
</property>
</bean>
<util:map id="retrievalPlans">
<entry key="OPSNET">
<ref local="OPSNETRetrievalPlan" />
</entry>
<entry key="SBN">
<ref local="SBNRetrievalPlan" />
</entry>
</util:map>
</beans>

7
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/retrieval/SubscriptionRetrievalAgent.java
View file

@ -88,7 +88,12 @@ public class SubscriptionRetrievalAgent extends
this.bandwidthDao = bandwidthDao;
this.retrievalDao = retrievalDao;
this.providerHandler = providerHandler;
this.retrievalQueue = retrievalQueue;
// SBN retrievals come from ingest processing
if (network.equals(Network.SBN)) {
this.retrievalQueue = null;
} else {
this.retrievalQueue = retrievalQueue;
}
}
@Override