From 6fea3049fdaf967cb7b481cc4dd36ff7bc3aef79 Mon Sep 17 00:00:00 2001 From: Pramila Singh Date: Mon, 16 Jun 2014 21:43:44 -0700 Subject: [PATCH] Incorrect connect API is called in ConnectionMgr when NodeType is provided Change-Id: I73d7539cfbd97cfd2f3da570c8e29ff0787d8f18 Signed-off-by: Pramila Singh --- .../connectionmanager/internal/ConnectionManager.java | 2 +- .../implementation/internal/ConnectionService.java | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/opendaylight/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/internal/ConnectionManager.java b/opendaylight/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/internal/ConnectionManager.java index ebc56928a2..d76c094851 100644 --- a/opendaylight/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/internal/ConnectionManager.java +++ b/opendaylight/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/internal/ConnectionManager.java @@ -261,7 +261,7 @@ public class ConnectionManager implements IConnectionManager, Map params) { if (connectionService == null) return null; - Node node = connectionService.connect(connectionIdentifier, params); + Node node = connectionService.connect(type, connectionIdentifier, params); AbstractScheme scheme = schemes.get(activeScheme); if (scheme != null && node != null) scheme.addNode(node); diff --git a/opendaylight/sal/connection/implementation/src/main/java/org/opendaylight/controller/sal/connection/implementation/internal/ConnectionService.java b/opendaylight/sal/connection/implementation/src/main/java/org/opendaylight/controller/sal/connection/implementation/internal/ConnectionService.java index b2cb414303..7bd15ff7f4 100644 --- a/opendaylight/sal/connection/implementation/src/main/java/org/opendaylight/controller/sal/connection/implementation/internal/ConnectionService.java +++ b/opendaylight/sal/connection/implementation/src/main/java/org/opendaylight/controller/sal/connection/implementation/internal/ConnectionService.java @@ -111,7 +111,9 @@ public class ConnectionService implements IPluginOutConnectionService, IConnecti @Override public Node connect (String type, String connectionIdentifier, Map params) { IPluginInConnectionService s = pluginService.get(type); - if (s != null) return s.connect(connectionIdentifier, params); + if (s != null) { + return s.connect(connectionIdentifier, params); + } return null; } @@ -121,7 +123,9 @@ public class ConnectionService implements IPluginOutConnectionService, IConnecti for (String pluginType : this.pluginService.keySet()) { IPluginInConnectionService s = pluginService.get(pluginType); Node node = s.connect(connectionIdentifier, params); - if (node != null) return node; + if (node != null) { + return node; + } } } return null; -- 2.36.6