Merge "Prevent ConfigPusher from killing its thread"

[controller.git] / opendaylight / md-sal / sal-binding-broker / src / main / java / org / opendaylight / controller / sal / binding / impl / connect / dom / BindingIndependentMountPointForwarder.java

diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/connect/dom/BindingIndependentMountPointForwarder.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/connect/dom/BindingIndependentMountPointForwarder.java
index 630b5fa8df7b576a4471a3e578b94efc1ba79d22..7b94845e8cd7e20903fc38cf312985ec11c950f9 100644 (file)
--- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/connect/dom/BindingIndependentMountPointForwarder.java
+++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/connect/dom/BindingIndependentMountPointForwarder.java
@@ -1,9 +1,18 @@
+/*
+ * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.opendaylight.controller.sal.binding.impl.connect.dom;
 
 import java.util.concurrent.ConcurrentMap;
 
 import org.opendaylight.controller.sal.binding.api.mount.MountProviderInstance;
 import org.opendaylight.controller.sal.binding.api.mount.MountProviderService;
+import org.opendaylight.yangtools.yang.data.impl.codec.BindingIndependentMappingService;
+import org.opendaylight.yangtools.yang.data.impl.codec.DeserializationException;
 import org.opendaylight.controller.sal.core.api.mount.MountProvisionInstance;
 import org.opendaylight.controller.sal.core.api.mount.MountProvisionService;
 import org.opendaylight.controller.sal.core.api.mount.MountProvisionService.MountProvisionListener;
@@ -15,7 +24,7 @@ public class BindingIndependentMountPointForwarder {
     private MountProvisionService domMountService;
     private MountProviderService baMountService;
     private BindingIndependentMappingService mappingService;
-    
+
     private final DomMountPointForwardingManager domForwardingManager = new DomMountPointForwardingManager();
     private final BindingMountPointForwardingManager bindingForwardingManager = new BindingMountPointForwardingManager();
 
@@ -57,11 +66,11 @@ public class BindingIndependentMountPointForwarder {
     private BindingIndependentConnector createForwarder(InstanceIdentifier<?> path, MountProviderInstance baMountPoint,
             MountProvisionInstance domMountPoint) {
         BindingIndependentConnector connector = new BindingIndependentConnector();
-        
+
         connector.setBindingDataService(baMountPoint);
         connector.setBindingRpcRegistry(baMountPoint);
         //connector.setBindingNotificationBroker(baMountPoint);
-        
+
         connector.setDomDataService(domMountPoint);
         connector.setDomRpcRegistry(domMountPoint);
         //connector.setDomNotificationBroker(domMountPoint);
@@ -78,7 +87,7 @@ public class BindingIndependentMountPointForwarder {
             }
             tryToDeployConnector(baPath,domPath);
         } catch (DeserializationException e) {
-            
+
         }
     }