X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fsal%2Fapi%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fpacket%2FLLDP.java;h=9b5dc082bb2303084775026131a11552b5614add;hb=531621aac4cff9d39cbd8668a53bdeba8a0e6d81;hp=95edca943bc8a61681c34c582f4aeb9dddb7972e;hpb=1ff9939abc7a4072b07df6b79516fe344b1b42e3;p=controller.git

diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/LLDP.java b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/LLDP.java
index 95edca943b..9b5dc082bb 100644
--- a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/LLDP.java
+++ b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/LLDP.java
@@ -12,6 +12,7 @@ import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.opendaylight.controller.sal.utils.HexEncode;
 import org.opendaylight.controller.sal.utils.NetUtils;
 
@@ -198,6 +199,9 @@ public class LLDP extends Packet {
         while (lldpSize > 0) {
             LLDPTLV tlv = new LLDPTLV();
             tlv.deserialize(data, lldpOffset, lldpSize);
+            if (tlv.getType() == 0 && tlv.getLength() == 0) {
+               break;
+            }
             int tlvSize = tlv.getTLVSize(); // Size of current TLV in bits
             lldpOffset += tlvSize;
             lldpSize -= tlvSize;