From ac0be0f8ff3e5b025d2148661f82dcd2d500501f Mon Sep 17 00:00:00 2001 From: Michal Rehak Date: Wed, 10 Sep 2014 20:02:02 +0200 Subject: [PATCH] BUG-1713: NPE by flow with push-vlan action (OF-1.0) - fixed empty action Change-Id: I21c8aced0024e70b05777487a75c695118c50a5d Signed-off-by: Michal Rehak --- .../openflow/md/core/sal/convertor/ActionConvertor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ActionConvertor.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ActionConvertor.java index 9acb1e615a..9aaf98da1c 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ActionConvertor.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ActionConvertor.java @@ -358,7 +358,7 @@ public final class ActionConvertor { if (version == OFConstants.OFP_VERSION_1_0) { // if client configure openflow 1.0 switch as a openflow 1.3 switch using openflow 1.3 instructions // then we can ignore PUSH_VLAN as set-vlan-id will push a vlan header if not present - return emtpyAction(actionBuilder); + return null; } PushVlanActionCase pushVlanActionCase = (PushVlanActionCase) action; -- 2.36.6