Clean up logging

[netvirt.git] / ovsdb-plugin-compatibility-layer / src / main / java / org / opendaylight / ovsdb / compatibility / plugin / impl / ConnectionServiceImpl.java

diff --git a/ovsdb-plugin-compatibility-layer/src/main/java/org/opendaylight/ovsdb/compatibility/plugin/impl/ConnectionServiceImpl.java b/ovsdb-plugin-compatibility-layer/src/main/java/org/opendaylight/ovsdb/compatibility/plugin/impl/ConnectionServiceImpl.java
index 25fb245a1442fed2a12258fb7bfdc07d846c489d..33b955198bef871c817633f015c8155d538e3215 100644 (file)
--- a/ovsdb-plugin-compatibility-layer/src/main/java/org/opendaylight/ovsdb/compatibility/plugin/impl/ConnectionServiceImpl.java
+++ b/ovsdb-plugin-compatibility-layer/src/main/java/org/opendaylight/ovsdb/compatibility/plugin/impl/ConnectionServiceImpl.java
@@ -11,11 +11,10 @@ import java.util.List;
 import java.util.Map;
 
 import org.opendaylight.controller.sal.core.Node;
+import org.opendaylight.ovsdb.compatibility.plugin.api.NodeUtils;
 import org.opendaylight.ovsdb.compatibility.plugin.api.OvsdbConnectionService;
 import org.opendaylight.ovsdb.plugin.api.Connection;
 import org.opendaylight.ovsdb.plugin.api.ConnectionConstants;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * This is a proxy class for ovsdb plugin's OvsdbConnectionService class
@@ -26,9 +25,8 @@ import org.slf4j.LoggerFactory;
  *
  */
 public class ConnectionServiceImpl implements OvsdbConnectionService{
-    protected static final Logger logger = LoggerFactory.getLogger(ConnectionServiceImpl.class);
 
-    org.opendaylight.ovsdb.plugin.api.OvsdbConnectionService pluginOvsdbConnectionService;
+    private volatile org.opendaylight.ovsdb.plugin.api.OvsdbConnectionService pluginOvsdbConnectionService;
 
     public void init() {
     }
@@ -61,27 +59,27 @@ public class ConnectionServiceImpl implements OvsdbConnectionService{
     }
 
     public void unsetOvsdbConnectionService(org.opendaylight.ovsdb.plugin.api.OvsdbConnectionService pluginOvsdbConnectionService){
-        if(this.pluginOvsdbConnectionService != null)
-            this.pluginOvsdbConnectionService = null;
+        this.pluginOvsdbConnectionService = null;
     }
+
     @Override
     public Connection getConnection(Node node) {
-        return pluginOvsdbConnectionService.getConnection(node);
+        return pluginOvsdbConnectionService.getConnection(NodeUtils.getMdsalNode(node));
     }
 
     @Override
     public Node getNode (String identifier) {
-        return pluginOvsdbConnectionService.getNode(identifier);
+        return NodeUtils.getSalNode(pluginOvsdbConnectionService.getNode(identifier));
     }
 
     @Override
     public List<Node> getNodes() {
-        return pluginOvsdbConnectionService.getNodes();
+        return NodeUtils.getSalNodes(pluginOvsdbConnectionService.getNodes());
     }
 
     @Override
     public Node connect(String identifier, Map<ConnectionConstants, String> params) {
-        return pluginOvsdbConnectionService.connect(identifier, params);
+        return NodeUtils.getSalNode(pluginOvsdbConnectionService.connect(identifier, params));
     }
 
 }