Fix shard deadlock in 3 nodes

[controller.git] / opendaylight / md-sal / sal-binding-broker / src / main / resources / org / opendaylight / blueprint / binding-broker.xml

diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/resources/org/opendaylight/blueprint/binding-broker.xml b/opendaylight/md-sal/sal-binding-broker/src/main/resources/org/opendaylight/blueprint/binding-broker.xml
index 6b89328f1c66cb8271f40a76dbcde406743937d1..2595420c846a4cb5856ae8cb598a40df7047db01 100644 (file)
--- a/opendaylight/md-sal/sal-binding-broker/src/main/resources/org/opendaylight/blueprint/binding-broker.xml
+++ b/opendaylight/md-sal/sal-binding-broker/src/main/resources/org/opendaylight/blueprint/binding-broker.xml
@@ -26,13 +26,7 @@
     </interfaces>
   </service>
 
-  <!-- We also register the BindingToNormalizedNodeCodec with its actual class name for
-       backwards compatibility for CSS users that inject the binding-dom-mapping-service -->
-  <bean id="mappingCodecServiceReg" class="org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCodecFactory"
-         factory-method="registerOSGiService" destroy-method="unregister">
-    <argument ref="mappingCodec"/>
-    <argument ref="blueprintBundleContext"/>
-  </bean>
+  <service id="codec" ref="mappingCodec" interface="org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCodec"/>
 
   <!-- Binding RPC Registry Service -->
 
@@ -135,4 +129,17 @@
   <service ref="bindingPingPongDataBroker" interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"
           odl:type="pingpong"/>
 
+  <!-- Legacy BindingAwareBroker -->
+
+  <bean id="bindingAwareBroker" class="org.opendaylight.controller.sal.binding.impl.RootBindingAwareBroker"
+      init-method="start" destroy-method="close">
+    <argument value="deprecated-BindingAwareBroker"/>
+    <property name="dataBroker" ref="bindingDataBroker"/>
+    <property name="mountService" ref="bindingMountPointService"/>
+    <property name="rpcBroker" ref="bindingRpcRegistry"/>
+    <property name="notificationBroker" ref="bindingNotificationProviderService"/>
+    <property name="notificationPublishService" ref="bindingNotificationPublishAdapter"/>
+  </bean>
+
+  <service ref="bindingAwareBroker" interface="org.opendaylight.controller.sal.binding.api.BindingAwareBroker"/>
 </blueprint>