Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
OpenFlow Protocol_plugin changes to make use of the Connection Manager infrastructure...
[controller.git]
/
opendaylight
/
protocol_plugins
/
openflow
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
protocol_plugin
/
openflow
/
internal
/
InventoryService.java
diff --git
a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/InventoryService.java
b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/InventoryService.java
index 6e6cb00f899d13a94188f7c76c439a68b331f573..9fded15f42383a1edceb436f5c8b010909a6e03b 100644
(file)
--- a/
opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/InventoryService.java
+++ b/
opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/InventoryService.java
@@
-22,6
+22,7
@@
import org.opendaylight.controller.protocol_plugin.openflow.IInventoryProvider;
import org.opendaylight.controller.protocol_plugin.openflow.IInventoryShimInternalListener;
import org.opendaylight.controller.protocol_plugin.openflow.core.IController;
import org.opendaylight.controller.protocol_plugin.openflow.core.ISwitch;
import org.opendaylight.controller.protocol_plugin.openflow.IInventoryShimInternalListener;
import org.opendaylight.controller.protocol_plugin.openflow.core.IController;
import org.opendaylight.controller.protocol_plugin.openflow.core.ISwitch;
+import org.opendaylight.controller.sal.connection.IPluginOutConnectionService;
import org.opendaylight.controller.sal.core.Node;
import org.opendaylight.controller.sal.core.NodeConnector;
import org.opendaylight.controller.sal.core.Property;
import org.opendaylight.controller.sal.core.Node;
import org.opendaylight.controller.sal.core.NodeConnector;
import org.opendaylight.controller.sal.core.Property;
@@
-73,8
+74,10
@@
public class InventoryService implements IInventoryShimInternalListener,
Dictionary props = c.getServiceProperties();
if (props != null) {
containerName = (String) props.get("containerName");
Dictionary props = c.getServiceProperties();
if (props != null) {
containerName = (String) props.get("containerName");
- isDefaultContainer = containerName.equals(GlobalConstants.DEFAULT
- .toString());
+ if (containerName != null) {
+ isDefaultContainer = containerName.equals(GlobalConstants.DEFAULT
+ .toString());
+ }
}
nodeProps = new ConcurrentHashMap<Node, Map<String, Property>>();
}
nodeProps = new ConcurrentHashMap<Node, Map<String, Property>>();
@@
-201,13
+204,6
@@
public class InventoryService implements IInventoryShimInternalListener,
return;
}
return;
}
- Set<Node> nodeSet = nodeProps.keySet();
- if (((props == null) || props.isEmpty()) && (nodeSet != null)
- && nodeSet.contains(node)) {
- // node already added
- return;
- }
-
logger.trace("addNode: {} added, props: {} for container {}",
new Object[] { node, props, containerName });
logger.trace("addNode: {} added, props: {} for container {}",
new Object[] { node, props, containerName });
@@
-297,5
+293,4
@@
public class InventoryService implements IInventoryShimInternalListener,
break;
}
}
break;
}
}
-
}
}