From: Tony Tkacik <ttkacik@cisco.com>
Date: Thu, 29 May 2014 10:37:59 +0000 (+0000)
Subject: Merge "BUG-648: include yangtools.util package"
X-Git-Tag: autorelease-tag-v20140601202136_82eb3f9~8
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=de14d488c480200a8b155220fad8285a1d78c9ee;hp=55debf51625d1d8f9c7bbda470ece63b2bd1b4a7

Merge "BUG-648: include yangtools.util package"
---

diff --git a/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/ComponentActivator.java b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/ComponentActivator.java
index b3a89a4ff9..ba68d523af 100644
--- a/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/ComponentActivator.java
+++ b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/ComponentActivator.java
@@ -107,6 +107,7 @@ public class ComponentActivator extends ComponentActivatorAbstractBase {
                 nodeConnectorFactory,
                 topology,
                 tpProvider,
+                this // Used for setBroker callback
         };
     }
 
diff --git a/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/DataPacketAdapter.java b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/DataPacketAdapter.java
index f95f97804f..4d26a3a095 100644
--- a/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/DataPacketAdapter.java
+++ b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/DataPacketAdapter.java
@@ -17,13 +17,19 @@ import org.slf4j.LoggerFactory;
 
 class DataPacketAdapter implements PacketProcessingListener {
     private static final Logger LOG = LoggerFactory.getLogger(DataPacketAdapter.class);
+
+    // These are injected via Apache DM (see ComponentActivator)
     private IPluginOutDataPacketService dataPacketPublisher;
 
     @Override
     public void onPacketReceived(final PacketReceived packet) {
         try {
             RawPacket inPacket = toRawPacket(packet);
-            dataPacketPublisher.receiveDataPacket(inPacket);
+            if (dataPacketPublisher != null) {
+                dataPacketPublisher.receiveDataPacket(inPacket);
+            } else {
+                LOG.warn("IPluginOutDataPacketService is not available. Not forwarding packet to AD-SAL.");
+            }
         } catch (ConstructionException e) {
             LOG.warn("Failed to construct raw packet from {}, dropping it", packet, e);
         }
@@ -34,4 +40,13 @@ class DataPacketAdapter implements PacketProcessingListener {
         ret.setIncomingNodeConnector(NodeMapping.toADNodeConnector(received.getIngress()));
         return ret;
     }
+
+    public IPluginOutDataPacketService getDataPacketPublisher() {
+        return dataPacketPublisher;
+    }
+
+    // These are injected via Apache DM (see ComponentActivator)
+    public void setDataPacketPublisher(final IPluginOutDataPacketService dataPacketPublisher) {
+        this.dataPacketPublisher = dataPacketPublisher;
+    }
 }
diff --git a/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/topology/TopologyAdapter.java b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/topology/TopologyAdapter.java
index b609addae4..4e3cf69817 100644
--- a/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/topology/TopologyAdapter.java
+++ b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/topology/TopologyAdapter.java
@@ -23,8 +23,10 @@ public class TopologyAdapter implements IPluginInTopologyService {
     private final InstanceIdentifier<Topology> topology = InstanceIdentifier.builder(NetworkTopology.class)
             .child(Topology.class, new TopologyKey(new TopologyId("flow:1"))).toInstance();
 
-    // FIXME: seems to be unused
+    // Injected via Apache DM
     private IPluginOutTopologyService topologyPublisher;
+
+
     private DataProviderService dataService;
 
     public void setDataService(final DataProviderService dataService) {
@@ -37,4 +39,12 @@ public class TopologyAdapter implements IPluginInTopologyService {
         final Topology t = reader.readOperationalData(topology);
         topologyPublisher.edgeUpdate(TopologyMapping.toADEdgeUpdates(t, reader));
     }
+
+    public IPluginOutTopologyService getTopologyPublisher() {
+        return topologyPublisher;
+    }
+
+    public void setTopologyPublisher(final IPluginOutTopologyService topologyPublisher) {
+        this.topologyPublisher = topologyPublisher;
+    }
 }