From cf865d6c4fb638d3fa4bb4e8249254d9e5571e4f Mon Sep 17 00:00:00 2001 From: Anil Vishnoi Date: Mon, 11 May 2015 21:28:48 +0530 Subject: [PATCH] Fixed instanceof comparison for iid Change-Id: I62c9ece787800302c92657877ed51db99cfc2c84 Signed-off-by: Anil Vishnoi --- .../openstack/netvirt/impl/OvsdbDataChangeListener.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/OvsdbDataChangeListener.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/OvsdbDataChangeListener.java index d984b9c87..d7e70f074 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/OvsdbDataChangeListener.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/OvsdbDataChangeListener.java @@ -211,7 +211,7 @@ public class OvsdbDataChangeListener implements DataChangeListener, AutoCloseabl private void processPortCreation( AsyncDataChangeEvent, DataObject> changes) { for(Map.Entry, DataObject> newPort : changes.getCreatedData().entrySet()){ - if(newPort.getKey() instanceof OvsdbTerminationPointAugmentation){ + if(newPort.getKey().getTargetType().equals(OvsdbTerminationPointAugmentation.class)){ LOG.info("Processing creation of new port : {}",newPort); //If user created termination point only, Node will get updated Node tpParentNode = getNode(changes.getUpdatedData(), newPort); @@ -262,7 +262,7 @@ public class OvsdbDataChangeListener implements DataChangeListener, AutoCloseabl AsyncDataChangeEvent, DataObject> changes) { for(Map.Entry, DataObject> updatedPort : changes.getUpdatedData().entrySet()){ - if(updatedPort.getKey() instanceof OvsdbTerminationPointAugmentation){ + if(updatedPort.getKey().getTargetType().equals(OvsdbTerminationPointAugmentation.class)){ LOG.info("Processing port update : {}",updatedPort); // XXX (NOTE): Extract parent node data from originalData(), rather then extracting it from // updatedData() because, extracting it from originalData() will give all the @@ -292,7 +292,7 @@ public class OvsdbDataChangeListener implements DataChangeListener, AutoCloseabl AsyncDataChangeEvent, DataObject> changes) { for(Map.Entry, DataObject> newBridge : changes.getCreatedData().entrySet()){ - if(newBridge.getKey() instanceof OvsdbBridgeAugmentation){ + if(newBridge.getKey().getTargetType().equals(OvsdbBridgeAugmentation.class)){ LOG.info("Processing creation of new bridge : {}",newBridge); //Bridge augmentation happens directly on the Node so Node details should also exist in created data. Node bridgeParentNode = getNode(changes.getCreatedData(),newBridge); @@ -313,7 +313,7 @@ public class OvsdbDataChangeListener implements DataChangeListener, AutoCloseabl AsyncDataChangeEvent, DataObject> changes) { for (Map.Entry, DataObject> updatedBridge : changes.getUpdatedData().entrySet()) { - if(updatedBridge.getKey() instanceof OvsdbBridgeAugmentation){ + if(updatedBridge.getKey().getTargetType().equals(OvsdbBridgeAugmentation.class)){ LOG.info("Processing update on a bridge : {}",updatedBridge); /* XXX (NOTE): Extract parent node data from originalData(), rather then extracting it from updatedData() because, extracting it from originalData() will give all the -- 2.36.6