Changing interface for message listener

Change-Id: I44d6762d6bb03552b118c639626a746c48b78871
Signed-off-by: Yugandhar <ysarraju@in.ibm.com>

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/ConnectionConductorImpl.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/ConnectionConductorImpl.java
index c40e49321975d3fe6b0ffef5fa475d5fd625845c..af3238a4312645841f9bd746c72284ee49bd1707 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/ConnectionConductorImpl.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/ConnectionConductorImpl.java
@@ -341,7 +341,7 @@ public class ConnectionConductorImpl implements OpenflowProtocolListener,
         if (listeners != null) {
                 for (IMDMessageListener listener : listeners) {
                 //TODO : need to add unit-tests
-                //listener.receive(this.getAuxiliaryKey().getId(), this.getSessionContext(), message);
+                //listener.receive(this.getAuxiliaryKey(), this.getSessionContext(), message);
             }
         }
     }

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/IMDMessageListener.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/IMDMessageListener.java
index 5ff3185a20af3a2f6d3e98fbc7b734c2d0d17990..0f44ca3a686ef12b0339c55031ca3b6629423ee4 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/IMDMessageListener.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/IMDMessageListener.java
@@ -15,6 +15,6 @@ public interface IMDMessageListener {
      * @param msg
      *            The OF message
      */
-    public void receive(byte[] cookie, SessionContext sw, DataObject msg);
+    public void receive(SwitchConnectionDistinguisher cookie, SessionContext sw, DataObject msg);
 
 }

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/MDController.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/MDController.java
index 26b3d87356a59de2bb119f3863f6a97efc29a657..d9d89be5ca70f59f9dfa11ac8935a862d90ac3a4 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/MDController.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/MDController.java
@@ -117,9 +117,9 @@ public class MDController implements IMDController {
         Collection<IMDMessageListener> existingValues = messageListeners.get(messageType);
         if (existingValues == null) {
                existingValues = new ArrayList<IMDMessageListener>();
+               messageListeners.put(messageType, existingValues);
         }
         existingValues.add(listener);
-        messageListeners.put(messageType, existingValues);
         // Push the updated Listeners to Session Manager which will be then picked up by ConnectionConductor eventually
         OFSessionUtil.getSessionManager().setListenerMapping(messageListeners);
         LOG.debug("{} is now listened by {}", messageType, listener);

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/MDControllerTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/MDControllerTest.java
index af536d9dd962f08fc82ba1ab8cbe44b992cd1769..ff1f374f22dcc1c6733cd8be9a1b004cb1b6ad95 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/MDControllerTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/MDControllerTest.java
@@ -85,14 +85,14 @@ public class MDControllerTest {
 
     private class DataPacketService implements IMDMessageListener {
         @Override
-        public void receive(byte[] cookie, SessionContext sw, DataObject msg) {
+        public void receive(SwitchConnectionDistinguisher cookie, SessionContext sw, DataObject msg) {
             LOG.debug("Received a packet in DataPacket Service");
         }
     }
 
     private class FlowProgrammerService implements IMDMessageListener {
         @Override
-        public void receive(byte[] cookie, SessionContext sw, DataObject msg) {
+        public void receive(SwitchConnectionDistinguisher cookie, SessionContext sw, DataObject msg) {
             LOG.debug("Received a packet in Flow Programmer Service");
         }
     }