From: Alexis de Talhouët Date: Tue, 9 Jun 2015 15:04:04 +0000 (-0400) Subject: Change EventDispatcher field visibility of AbstractHandler to protected. X-Git-Tag: release/beryllium-sr2~550 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=1e1e276653ec1e0ffbd47bcaca31b4f72353923c;p=netvirt.git Change EventDispatcher field visibility of AbstractHandler to protected. Instead of having EventDisptacher private, we set it as protected thus all the classes that extends AbstractHandler can use the variable. This patch remove: - the setDispatcher() method from AbstractHandler - the declared EventDispactcher field of the classes extending AbstractHandler Change-Id: Idbd000def09aa91cc4e40976ac4a37274bfce762 Signed-off-by: Alexis de Talhouët --- diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/AbstractHandler.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/AbstractHandler.java index 7abc1f62f6..4d611c832c 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/AbstractHandler.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/AbstractHandler.java @@ -32,16 +32,12 @@ public abstract class AbstractHandler { }*/ // The implementation for each of these services is resolved by the OSGi Service Manager - private volatile EventDispatcher eventDispatcher; + protected volatile EventDispatcher eventDispatcher; /*void init() { logger.info(">>>>> init {}", this.getClass()); }*/ - protected void setDispatcher(EventDispatcher eventDispatcher) { - this.eventDispatcher = eventDispatcher; - } - /** * Convert failure status returned by the manager into * neutron API service errors. diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/FWaasHandler.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/FWaasHandler.java index 84d1fa99d2..6684101994 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/FWaasHandler.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/FWaasHandler.java @@ -9,6 +9,8 @@ package org.opendaylight.ovsdb.openstack.netvirt; +import java.net.HttpURLConnection; + import org.opendaylight.neutron.spi.INeutronFirewallAware; import org.opendaylight.neutron.spi.INeutronFirewallPolicyAware; import org.opendaylight.neutron.spi.INeutronFirewallRuleAware; @@ -22,8 +24,6 @@ import org.osgi.framework.ServiceReference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.net.HttpURLConnection; - /** * Handle requests for OpenStack Neutron v2.0 Port Firewall API calls. */ @@ -32,7 +32,6 @@ public class FWaasHandler extends AbstractHandler INeutronFirewallPolicyAware, ConfigInterface { static final Logger logger = LoggerFactory.getLogger(FWaasHandler.class); - private volatile EventDispatcher eventDispatcher; /** * Invoked when a Firewall Rules creation is requested @@ -211,7 +210,6 @@ public class FWaasHandler extends AbstractHandler (EventDispatcher) ServiceHelper.getGlobalInstance(EventDispatcher.class, this); eventDispatcher.eventHandlerAdded( bundleContext.getServiceReference(INeutronFirewallAware.class.getName()), this); - super.setDispatcher(eventDispatcher); } @Override diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/FloatingIPHandler.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/FloatingIPHandler.java index cda629dc7f..7aaaa2857b 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/FloatingIPHandler.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/FloatingIPHandler.java @@ -9,20 +9,19 @@ */ package org.opendaylight.ovsdb.openstack.netvirt; +import java.net.HttpURLConnection; + import org.opendaylight.neutron.spi.INeutronFloatingIPAware; import org.opendaylight.neutron.spi.NeutronFloatingIP; import org.opendaylight.ovsdb.openstack.netvirt.api.Action; import org.opendaylight.ovsdb.openstack.netvirt.api.EventDispatcher; import org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter; - import org.opendaylight.ovsdb.utils.servicehelper.ServiceHelper; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.net.HttpURLConnection; - /** * Handle requests for Neutron Floating IP. */ @@ -33,7 +32,6 @@ public class FloatingIPHandler extends AbstractHandler // The implementation for each of these services is resolved by the OSGi Service Manager private volatile NeutronL3Adapter neutronL3Adapter; - private volatile EventDispatcher eventDispatcher; /** * Services provide this interface method to indicate if the specified floatingIP can be created @@ -150,7 +148,6 @@ public class FloatingIPHandler extends AbstractHandler (EventDispatcher) ServiceHelper.getGlobalInstance(EventDispatcher.class, this); eventDispatcher.eventHandlerAdded( bundleContext.getServiceReference(INeutronFloatingIPAware.class.getName()), this); - super.setDispatcher(eventDispatcher); neutronL3Adapter = (NeutronL3Adapter) ServiceHelper.getGlobalInstance(NeutronL3Adapter.class, this); } diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/LBaaSHandler.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/LBaaSHandler.java index 3710696f24..d3c74ba9f4 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/LBaaSHandler.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/LBaaSHandler.java @@ -10,6 +10,10 @@ package org.opendaylight.ovsdb.openstack.netvirt; +import java.net.HttpURLConnection; +import java.util.List; +import java.util.Map; + import org.opendaylight.neutron.spi.INeutronLoadBalancerAware; import org.opendaylight.neutron.spi.INeutronLoadBalancerCRUD; import org.opendaylight.neutron.spi.INeutronLoadBalancerPoolCRUD; @@ -23,8 +27,8 @@ import org.opendaylight.ovsdb.openstack.netvirt.api.Action; import org.opendaylight.ovsdb.openstack.netvirt.api.EventDispatcher; import org.opendaylight.ovsdb.openstack.netvirt.api.LoadBalancerConfiguration; import org.opendaylight.ovsdb.openstack.netvirt.api.LoadBalancerProvider; -import org.opendaylight.ovsdb.openstack.netvirt.api.NodeCacheManager; import org.opendaylight.ovsdb.openstack.netvirt.api.NodeCacheListener; +import org.opendaylight.ovsdb.openstack.netvirt.api.NodeCacheManager; import org.opendaylight.ovsdb.utils.servicehelper.ServiceHelper; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; import org.osgi.framework.BundleContext; @@ -34,10 +38,6 @@ import org.slf4j.LoggerFactory; import com.google.common.base.Preconditions; -import java.net.HttpURLConnection; -import java.util.List; -import java.util.Map; - /** * Handle requests for OpenStack Neutron v2.0 LBaaS API calls for /v2.0/loadbalancers. */ @@ -56,7 +56,6 @@ public class LBaaSHandler extends AbstractHandler private volatile INeutronSubnetCRUD neutronSubnetCache; private volatile LoadBalancerProvider loadBalancerProvider; private volatile NodeCacheManager nodeCacheManager; - private volatile EventDispatcher eventDispatcher; @Override public int canCreateNeutronLoadBalancer(NeutronLoadBalancer neutronLB) { @@ -269,7 +268,6 @@ public class LBaaSHandler extends AbstractHandler (EventDispatcher) ServiceHelper.getGlobalInstance(EventDispatcher.class, this); eventDispatcher.eventHandlerAdded( bundleContext.getServiceReference(INeutronLoadBalancerAware.class.getName()), this); - super.setDispatcher(eventDispatcher); } @Override diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/LBaaSPoolHandler.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/LBaaSPoolHandler.java index ee349b235a..86fd90e084 100755 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/LBaaSPoolHandler.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/LBaaSPoolHandler.java @@ -10,6 +10,10 @@ package org.opendaylight.ovsdb.openstack.netvirt; +import java.net.HttpURLConnection; +import java.util.List; +import java.util.Map; + import org.opendaylight.neutron.spi.INeutronLoadBalancerCRUD; import org.opendaylight.neutron.spi.INeutronLoadBalancerPoolAware; import org.opendaylight.neutron.spi.INeutronNetworkCRUD; @@ -33,10 +37,6 @@ import org.slf4j.LoggerFactory; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import java.net.HttpURLConnection; -import java.util.List; -import java.util.Map; - /** * Handle requests for OpenStack Neutron v2.0 LBaaS API calls for * /v2.0/pools . It is possible that each pool spans multiple subnets. @@ -55,7 +55,6 @@ public class LBaaSPoolHandler extends AbstractHandler private volatile INeutronSubnetCRUD neutronSubnetCache; private volatile LoadBalancerProvider loadBalancerProvider; private volatile NodeCacheManager nodeCacheManager; - private volatile EventDispatcher eventDispatcher; @Override public int canCreateNeutronLoadBalancerPool(NeutronLoadBalancerPool neutronLBPool) { @@ -278,7 +277,6 @@ public class LBaaSPoolHandler extends AbstractHandler (EventDispatcher) ServiceHelper.getGlobalInstance(EventDispatcher.class, this); eventDispatcher.eventHandlerAdded( bundleContext.getServiceReference(INeutronLoadBalancerPoolAware.class.getName()), this); - super.setDispatcher(eventDispatcher); } @Override diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/LBaaSPoolMemberHandler.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/LBaaSPoolMemberHandler.java index ab3bdc3c4a..4b577c0f6a 100755 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/LBaaSPoolMemberHandler.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/LBaaSPoolMemberHandler.java @@ -9,6 +9,10 @@ */ package org.opendaylight.ovsdb.openstack.netvirt; +import java.net.HttpURLConnection; +import java.util.List; +import java.util.Map; + import org.opendaylight.neutron.spi.INeutronLoadBalancerCRUD; import org.opendaylight.neutron.spi.INeutronLoadBalancerPoolCRUD; import org.opendaylight.neutron.spi.INeutronLoadBalancerPoolMemberAware; @@ -32,10 +36,6 @@ import org.slf4j.LoggerFactory; import com.google.common.base.Preconditions; -import java.net.HttpURLConnection; -import java.util.List; -import java.util.Map; - /** * Handle requests for OpenStack Neutron v2.0 LBaaS API calls for * /v2.0/pools/{pool_id}/members @@ -53,7 +53,6 @@ public class LBaaSPoolMemberHandler extends AbstractHandler private volatile INeutronSubnetCRUD neutronSubnetCache; private volatile LoadBalancerProvider loadBalancerProvider; private volatile NodeCacheManager nodeCacheManager; - private volatile EventDispatcher eventDispatcher; @Override public int canCreateNeutronLoadBalancerPoolMember(NeutronLoadBalancerPoolMember neutronLBPoolMember) { @@ -285,7 +284,6 @@ public class LBaaSPoolMemberHandler extends AbstractHandler (EventDispatcher) ServiceHelper.getGlobalInstance(EventDispatcher.class, this); eventDispatcher.eventHandlerAdded( bundleContext.getServiceReference(INeutronLoadBalancerPoolMemberAware.class.getName()), this); - super.setDispatcher(eventDispatcher); } @Override diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/NetworkHandler.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/NetworkHandler.java index 3f7b575c1e..43150c4da5 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/NetworkHandler.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/NetworkHandler.java @@ -9,6 +9,9 @@ */ package org.opendaylight.ovsdb.openstack.netvirt; +import java.net.HttpURLConnection; +import java.util.List; + import org.opendaylight.neutron.spi.INeutronNetworkAware; import org.opendaylight.neutron.spi.INeutronNetworkCRUD; import org.opendaylight.neutron.spi.NeutronNetwork; @@ -27,9 +30,6 @@ import org.osgi.framework.ServiceReference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.net.HttpURLConnection; -import java.util.List; - /** * Handle requests for Neutron Network. */ @@ -45,7 +45,6 @@ public class NetworkHandler extends AbstractHandler implements INeutronNetworkAw private volatile NodeCacheManager nodeCacheManager; private volatile INeutronNetworkCRUD neutronNetworkCache; private volatile NeutronL3Adapter neutronL3Adapter; - private volatile EventDispatcher eventDispatcher; private volatile Southbound southbound; /** @@ -211,7 +210,6 @@ public class NetworkHandler extends AbstractHandler implements INeutronNetworkAw (EventDispatcher) ServiceHelper.getGlobalInstance(EventDispatcher.class, this); eventDispatcher.eventHandlerAdded( bundleContext.getServiceReference(INeutronNetworkAware.class.getName()), this); - super.setDispatcher(eventDispatcher); } @Override diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/PortHandler.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/PortHandler.java index 4ed2a6e104..2ecf1090b8 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/PortHandler.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/PortHandler.java @@ -9,6 +9,9 @@ */ package org.opendaylight.ovsdb.openstack.netvirt; +import java.net.HttpURLConnection; +import java.util.List; + import org.opendaylight.neutron.spi.INeutronPortAware; import org.opendaylight.neutron.spi.NeutronPort; import org.opendaylight.ovsdb.openstack.netvirt.api.Action; @@ -25,9 +28,6 @@ import org.osgi.framework.ServiceReference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.net.HttpURLConnection; -import java.util.List; - /** * Handle requests for Neutron Port. */ @@ -37,7 +37,6 @@ public class PortHandler extends AbstractHandler implements INeutronPortAware, C // The implementation for each of these services is resolved by the OSGi Service Manager private volatile NodeCacheManager nodeCacheManager; private volatile NeutronL3Adapter neutronL3Adapter; - private volatile EventDispatcher eventDispatcher; private volatile Southbound southbound; /** @@ -188,7 +187,6 @@ public class PortHandler extends AbstractHandler implements INeutronPortAware, C (EventDispatcher) ServiceHelper.getGlobalInstance(EventDispatcher.class, this); eventDispatcher.eventHandlerAdded( bundleContext.getServiceReference(INeutronPortAware.class.getName()), this); - super.setDispatcher(eventDispatcher); } @Override diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/PortSecurityHandler.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/PortSecurityHandler.java index 5a3cbca535..f82354f36a 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/PortSecurityHandler.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/PortSecurityHandler.java @@ -10,11 +10,12 @@ package org.opendaylight.ovsdb.openstack.netvirt; +import java.net.HttpURLConnection; + import org.opendaylight.neutron.spi.INeutronSecurityGroupAware; import org.opendaylight.neutron.spi.INeutronSecurityRuleAware; import org.opendaylight.neutron.spi.NeutronSecurityGroup; import org.opendaylight.neutron.spi.NeutronSecurityRule; - import org.opendaylight.ovsdb.openstack.netvirt.api.EventDispatcher; import org.opendaylight.ovsdb.utils.servicehelper.ServiceHelper; import org.osgi.framework.BundleContext; @@ -22,8 +23,6 @@ import org.osgi.framework.ServiceReference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.net.HttpURLConnection; - /** * Handle requests for OpenStack Neutron v2.0 Port Security API calls. */ @@ -31,7 +30,6 @@ public class PortSecurityHandler extends AbstractHandler implements INeutronSecurityGroupAware, INeutronSecurityRuleAware, ConfigInterface { static final Logger logger = LoggerFactory.getLogger(PortSecurityHandler.class); - private volatile EventDispatcher eventDispatcher; @Override public int canCreateNeutronSecurityGroup(NeutronSecurityGroup neutronSecurityGroup) { @@ -150,7 +148,6 @@ public class PortSecurityHandler extends AbstractHandler (EventDispatcher) ServiceHelper.getGlobalInstance(EventDispatcher.class, this); eventDispatcher.eventHandlerAdded( bundleContext.getServiceReference(INeutronSecurityGroupAware.class.getName()), this); - super.setDispatcher(eventDispatcher); } @Override diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/RouterHandler.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/RouterHandler.java index 0b50cfed4b..bc9aab75d9 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/RouterHandler.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/RouterHandler.java @@ -9,21 +9,20 @@ */ package org.opendaylight.ovsdb.openstack.netvirt; +import java.net.HttpURLConnection; + import org.opendaylight.neutron.spi.INeutronRouterAware; import org.opendaylight.neutron.spi.NeutronRouter; import org.opendaylight.neutron.spi.NeutronRouter_Interface; import org.opendaylight.ovsdb.openstack.netvirt.api.Action; import org.opendaylight.ovsdb.openstack.netvirt.api.EventDispatcher; import org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter; - import org.opendaylight.ovsdb.utils.servicehelper.ServiceHelper; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.net.HttpURLConnection; - /** * Handle requests for Neutron Router. */ @@ -32,7 +31,6 @@ public class RouterHandler extends AbstractHandler implements INeutronRouterAwar // The implementation for each of these services is resolved by the OSGi Service Manager private volatile NeutronL3Adapter neutronL3Adapter; - private volatile EventDispatcher eventDispatcher; /** * Services provide this interface method to indicate if the specified router can be created @@ -227,7 +225,6 @@ public class RouterHandler extends AbstractHandler implements INeutronRouterAwar (EventDispatcher) ServiceHelper.getGlobalInstance(EventDispatcher.class, this); eventDispatcher.eventHandlerAdded( bundleContext.getServiceReference(INeutronRouterAware.class.getName()), this); - super.setDispatcher(eventDispatcher); } @Override diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/SouthboundHandler.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/SouthboundHandler.java index 55fd4b3070..f7a27322af 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/SouthboundHandler.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/SouthboundHandler.java @@ -41,7 +41,6 @@ public class SouthboundHandler extends AbstractHandler private volatile NetworkingProviderManager networkingProviderManager; private volatile NeutronL3Adapter neutronL3Adapter; private volatile NodeCacheManager nodeCacheManager; - private volatile EventDispatcher eventDispatcher; private volatile OvsdbInventoryService ovsdbInventoryService; private volatile Southbound southbound; @@ -412,7 +411,6 @@ public class SouthboundHandler extends AbstractHandler (EventDispatcher) ServiceHelper.getGlobalInstance(EventDispatcher.class, this); eventDispatcher.eventHandlerAdded( bundleContext.getServiceReference(OvsdbInventoryListener.class.getName()), this); - super.setDispatcher(eventDispatcher); ovsdbInventoryService = (OvsdbInventoryService) ServiceHelper.getGlobalInstance(OvsdbInventoryService.class, this); ovsdbInventoryService.listenerAdded(this); diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/SubnetHandler.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/SubnetHandler.java index c84c7d5b4a..8c63f0ad0b 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/SubnetHandler.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/SubnetHandler.java @@ -10,20 +10,20 @@ package org.opendaylight.ovsdb.openstack.netvirt; +import java.net.HttpURLConnection; + import org.opendaylight.neutron.spi.INeutronSubnetAware; import org.opendaylight.neutron.spi.NeutronSubnet; import org.opendaylight.ovsdb.openstack.netvirt.api.Action; import org.opendaylight.ovsdb.openstack.netvirt.api.EventDispatcher; import org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter; - -import com.google.common.base.Preconditions; import org.opendaylight.ovsdb.utils.servicehelper.ServiceHelper; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.net.HttpURLConnection; +import com.google.common.base.Preconditions; public class SubnetHandler extends AbstractHandler implements INeutronSubnetAware, ConfigInterface { @@ -31,7 +31,6 @@ public class SubnetHandler extends AbstractHandler implements INeutronSubnetAwar // The implementation for each of these services is resolved by the OSGi Service Manager private volatile NeutronL3Adapter neutronL3Adapter; - private EventDispatcher eventDispatcher; @Override public int canCreateSubnet(NeutronSubnet subnet) { @@ -99,7 +98,6 @@ public class SubnetHandler extends AbstractHandler implements INeutronSubnetAwar (EventDispatcher) ServiceHelper.getGlobalInstance(EventDispatcher.class, this); eventDispatcher.eventHandlerAdded( bundleContext.getServiceReference(INeutronSubnetAware.class.getName()), this); - super.setDispatcher(eventDispatcher); } @Override diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NodeCacheManagerImpl.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NodeCacheManagerImpl.java index 8a3e4316c2..16c87b8f53 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NodeCacheManagerImpl.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NodeCacheManagerImpl.java @@ -7,11 +7,10 @@ */ package org.opendaylight.ovsdb.openstack.netvirt.impl; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; + import org.opendaylight.ovsdb.openstack.netvirt.AbstractEvent; import org.opendaylight.ovsdb.openstack.netvirt.AbstractHandler; import org.opendaylight.ovsdb.openstack.netvirt.ConfigInterface; @@ -29,6 +28,9 @@ import org.osgi.framework.ServiceReference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; + /** * @author Flavio Fernandes (ffernand@redhat.com) * @author Sam Hague (shague@redhat.com) @@ -38,7 +40,6 @@ public class NodeCacheManagerImpl extends AbstractHandler implements NodeCacheMa private final Object nodeCacheLock = new Object(); private Map nodeCache = new ConcurrentHashMap<>(); private Map handlers = Maps.newHashMap(); - private volatile EventDispatcher eventDispatcher; private volatile Southbound southbound; @Override @@ -172,7 +173,6 @@ public class NodeCacheManagerImpl extends AbstractHandler implements NodeCacheMa (EventDispatcher) ServiceHelper.getGlobalInstance(EventDispatcher.class, this); eventDispatcher.eventHandlerAdded( bundleContext.getServiceReference(NodeCacheManager.class.getName()), this); - super.setDispatcher(eventDispatcher); } @Override