Omaha #3622 Fix null pointer in ServiceBackupLockManager

Change-Id: Idd29ac0b5330d9f2167c8fdc4acfd6e1ed961a99

Former-commit-id: e6ae629d1667943ae7bf25598f32e2b479e748b1
This commit is contained in:
Ron Anderson 2014-09-30 11:25:58 -05:00
parent 8c0a087bf0
commit 1c6fa09d4f

View file

@ -1,7 +1,8 @@
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
<bean id="ValidateConfigRequestHandler"
class="com.raytheon.uf.edex.site.handlers.ValidateConfigRequestHandler" />
<bean factory-bean="handlerRegistry" factory-method="register">
@ -9,7 +10,7 @@
value="com.raytheon.uf.common.site.requests.ValidateConfigRequest" />
<constructor-arg ref="ValidateConfigRequestHandler" />
</bean>
<bean id="activateSiteHandler"
class="com.raytheon.uf.edex.site.handlers.ActivateSiteHandler" />
<bean factory-bean="handlerRegistry" factory-method="register">
@ -17,7 +18,7 @@
value="com.raytheon.uf.common.site.requests.ActivateSiteRequest" />
<constructor-arg ref="activateSiteHandler" />
</bean>
<bean id="deactivateSiteHandler"
class="com.raytheon.uf.edex.site.handlers.DeactivateSiteHandler" />
<bean factory-bean="handlerRegistry" factory-method="register">
@ -25,7 +26,7 @@
value="com.raytheon.uf.common.site.requests.DeactivateSiteRequest" />
<constructor-arg ref="deactivateSiteHandler" />
</bean>
<bean id="getActiveSitesHandler"
class="com.raytheon.uf.edex.site.handlers.GetActiveSitesHandler" />
<bean factory-bean="handlerRegistry" factory-method="register">
@ -33,25 +34,30 @@
value="com.raytheon.uf.common.site.requests.GetActiveSitesRequest" />
<constructor-arg ref="getActiveSitesHandler" />
</bean>
<bean id="siteActivateNotifyFilter"
class="com.raytheon.uf.edex.site.notify.SiteActivateNotifyFilter" />
<bean id="siteActivationMonitor" class="com.raytheon.uf.edex.site.SiteActivationMonitor" factory-method="getInstance"/>
<camelContext id="siteActivationMonitoring"
xmlns="http://camel.apache.org/schema/spring"
errorHandlerRef="errorHandler">
<route id="siteActivateNotify">
<from uri="jms-generic:topic:siteActivateNotification" />
<bean ref="serializationUtil" method="transformFromThrift"/>
<filter>
<method bean="siteActivateNotifyFilter" method="isSiteActivateNotification" />
<bean ref="siteActivationMonitor" method="handleNotification"/>
<bean ref="serializationUtil" method="transformToThrift" />
<to uri="jms-generic:topic:edex.alerts.siteActivate?timeToLive=60000" />
</filter>
</route>
</camelContext>
<bean id="siteActivateNotifyFilter"
class="com.raytheon.uf.edex.site.notify.SiteActivateNotifyFilter" />
<bean id="siteActivationMonitor" class="com.raytheon.uf.edex.site.SiteActivationMonitor"
factory-method="getInstance" />
<camelContext id="siteActivationMonitoring"
xmlns="http://camel.apache.org/schema/spring" errorHandlerRef="errorHandler">
<route id="siteActivateNotify">
<from uri="jms-generic:topic:siteActivateNotification" />
<bean ref="serializationUtil" method="transformFromThrift" />
<filter>
<method bean="siteActivateNotifyFilter" method="isSiteActivateNotification" />
<bean ref="siteActivationMonitor" method="handleNotification" />
<filter>
<simple>${body} == null</simple>
<stop />
</filter>
<bean ref="serializationUtil" method="transformToThrift" />
<to
uri="jms-generic:topic:edex.alerts.siteActivate?timeToLive=60000" />
</filter>
</route>
</camelContext>
</beans>