Fix of NPEs and attempt to fix Neutron mapper.

[groupbasedpolicy.git] / renderers / ofoverlay / src / test / java / org / opendaylight / groupbasedpolicy / renderer / ofoverlay / flow / PortSecurityTest.java

diff --git a/renderers/ofoverlay/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/PortSecurityTest.java b/renderers/ofoverlay/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/PortSecurityTest.java
index 38103e02f6b8cb442e3ff60c88f1275677a6f56c..3fecbf76036df7dbab1d78efb0a3ec9494fc8339 100755 (executable)
--- a/renderers/ofoverlay/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/PortSecurityTest.java
+++ b/renderers/ofoverlay/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/PortSecurityTest.java
@@ -62,7 +62,7 @@ public class PortSecurityTest extends FlowTableTest {
         for (Flow f : fm.getTableForNode(nodeId, (short) 0).getFlow()) {\r
             flowMap.put(f.getId().getValue(), f);\r
             Long etherType = null;\r
-            if (f.getMatch() != null) {\r
+            if (f.getMatch() != null && f.getMatch().getEthernetMatch() !=null) {\r
                 etherType = f.getMatch().getEthernetMatch().getEthernetType().getType().getValue();\r
             }\r
             if (f.getMatch() == null || FlowUtils.ARP.equals(etherType) || FlowUtils.IPv4.equals(etherType)\r