Fix errors in serializers and deserializers

[openflowplugin.git] / openflowplugin-impl / src / main / java / org / opendaylight / openflowplugin / impl / protocol / deserialization / match / Ipv6NdTargetEntryDeserializer.java

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/Ipv6NdTargetEntryDeserializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/Ipv6NdTargetEntryDeserializer.java
index fd406b348cd48ad586808a2e160bfbec890be020..53219061656e6587e4545cdcb0664637dd1efe8c 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/Ipv6NdTargetEntryDeserializer.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/Ipv6NdTargetEntryDeserializer.java
@@ -29,13 +29,14 @@ public class Ipv6NdTargetEntryDeserializer extends AbstractMatchEntryDeserialize
             builder.setLayer3Match(new Ipv6MatchBuilder()
                     .setIpv6NdTarget(address)
                     .build());
-        } else if (Ipv6Match.class.isInstance(builder.getLayer3Match())) {
+        } else if (Ipv6Match.class.isInstance(builder.getLayer3Match())
+            && Objects.isNull(Ipv6Match.class.cast(builder.getLayer3Match()).getIpv6NdTarget())) {
             final Ipv6Match match = Ipv6Match.class.cast(builder.getLayer3Match());
             builder.setLayer3Match(new Ipv6MatchBuilder(match)
                     .setIpv6NdTarget(address)
                     .build());
         } else {
-            throwErrorOnMalformed(builder, "layer3Match");
+            throwErrorOnMalformed(builder, "layer3Match", "ipv6NdTarget");
         }
 
     }