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

Issue #2726: Remove CPG forwarding route

Browse source 
Change-Id: Idf2238ddde88d2a88949c289302a73b8aaf752e9

Former-commit-id: 3b29088641ed4b857b3eca55bc873b151dd86146
This commit is contained in:
Richard Peter 2014-04-17 15:07:11 -05:00
parent 66929690c7
commit 26bdab715a
2 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
View file

@ -5,14 +5,6 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
<bean id="cpgSrvDispatcher" class="com.raytheon.uf.edex.cpgsrv.CPGDispatcher" depends-on="commonTimeRegistered"/>
<camelContext id="cpgsrv-camel"
xmlns="http://camel.apache.org/schema/spring"
errorHandlerRef="errorHandler">
<route id="cpgProcessAlerts">
<from uri="direct-vm:processCPGAlerts"/>
<to uri="direct-vm:stageNotification"/>
</route>
</camelContext>
<camelContext id="clusteredCpgSrvRoutes"
xmlns="http://camel.apache.org/schema/spring"
errorHandlerRef="errorHandler">

15
edexOsgi/com.raytheon.uf.edex.cpgsrv/src/com/raytheon/uf/edex/cpgsrv/CompositeProductGenerator.java
View file

@ -61,7 +61,7 @@ import com.raytheon.uf.edex.database.plugin.PluginDao;
* 02/05/2013 1580 mpduff EventBus refactor.
* 02/12/2013 1615 bgonzale Changed ProcessEvent pluginName to dataType.
* Feb 15, 2013 1638 mschenke Moved DataURINotificationMessage to uf.common.dataplugin
*
* Apr 17, 2014 2726 rjpeter Updated to send alerts directly to notification route.
* </pre>
*
* @author dhladky
@ -380,7 +380,7 @@ public abstract class CompositeProductGenerator implements
protected void persistRecords() {
try {
PluginDataObject[] pdos = getPluginDataObjects();
if (pdos != null && getDao() != null && pdos.length > 0) {
if ((pdos != null) && (getDao() != null) && (pdos.length > 0)) {
EDEXUtil.checkPersistenceTimes(pdos);
getDao().persistRecords(pdos);
}
@ -394,10 +394,10 @@ public abstract class CompositeProductGenerator implements
*/
protected void fireTopicUpdate() {
try {
if (getPluginDataObjects() != null
&& getPluginDataObjects().length > 0) {
EDEXUtil.getMessageProducer().sendAsync("cpgProcessAlerts",
getPluginDataObjects());
if ((getPluginDataObjects() != null)
&& (getPluginDataObjects().length > 0)) {
EDEXUtil.getMessageProducer().sendAsync(
"notificationAggregation", getPluginDataObjects());
}
} catch (EdexException e) {
e.printStackTrace();
@ -437,7 +437,8 @@ public abstract class CompositeProductGenerator implements
@Override
public void log(URIGenerateMessage message) {
if (getPluginDataObjects() != null && getPluginDataObjects().length > 0) {
if ((getPluginDataObjects() != null)
&& (getPluginDataObjects().length > 0)) {
long curTime = System.currentTimeMillis();
ProcessEvent processEvent = new ProcessEvent();