Return singleton empty collection instead of null in Read service code

[controller.git] / opendaylight / sal / implementation / src / main / java / org / opendaylight / controller / sal / implementation / internal / DataPacketService.java

diff --git a/opendaylight/sal/implementation/src/main/java/org/opendaylight/controller/sal/implementation/internal/DataPacketService.java b/opendaylight/sal/implementation/src/main/java/org/opendaylight/controller/sal/implementation/internal/DataPacketService.java
index a9eefd3a8a689d8b4d92bd76fc4ec0edf1198193..e9039261a3724fb733f5a260300c291e9712224a 100644 (file)
--- a/opendaylight/sal/implementation/src/main/java/org/opendaylight/controller/sal/implementation/internal/DataPacketService.java
+++ b/opendaylight/sal/implementation/src/main/java/org/opendaylight/controller/sal/implementation/internal/DataPacketService.java
@@ -40,6 +40,7 @@ import org.opendaylight.controller.sal.packet.LinkEncap;
 import org.opendaylight.controller.sal.packet.Packet;
 import org.opendaylight.controller.sal.packet.PacketResult;
 import org.opendaylight.controller.sal.packet.RawPacket;
+import org.opendaylight.controller.sal.utils.GlobalConstants;
 import org.opendaylight.controller.sal.utils.NetUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -217,7 +218,7 @@ public class DataPacketService implements IPluginOutDataPacketService,
             logger.trace("Prop key:({}) value:({})",entry.getKey(), entry.getValue());
         }
 
-        Object value = props.get("protocolPluginType");
+        Object value = props.get(GlobalConstants.PROTOCOLPLUGINTYPE.toString());
         if (value instanceof String) {
             type = (String) value;
         }
@@ -243,7 +244,7 @@ public class DataPacketService implements IPluginOutDataPacketService,
             logger.trace("Prop key:({}) value:({})",entry.getKey(), entry.getValue());
         }
 
-        Object value = props.get("protocoloPluginType");
+        Object value = props.get(GlobalConstants.PROTOCOLPLUGINTYPE.toString());
         if (value instanceof String) {
             type = (String) value;
         }
@@ -323,7 +324,6 @@ public class DataPacketService implements IPluginOutDataPacketService,
                 // find it lets just add our dependency at the end of
                 // the list.
                 for (List<DataPacketListener> serialListeners : this.listenDataPacket) {
-                    int i = 0;
                     boolean done = false;
                     if (serialListeners.contains(lDependency)) {
                         serialListeners.add(l);