From: Moiz Raja <moraja@cisco.com>
Date: Fri, 3 Jan 2014 00:58:01 +0000 (-0800)
Subject: Set Node on the AddFlowInput and RemoveFlowInput
X-Git-Tag: jenkins-controller-bulk-release-prepare-only-2-1~133^2~3
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=b4598c553c1adcc6f4e185f714d29ada741eb1df

Set Node on the AddFlowInput and RemoveFlowInput

This avoids the NPE reported in bug #259

Change-Id: Ic48123a39d4d2fa0b280ac5540f6a5e1304036ef
Signed-off-by: Moiz Raja <moraja@cisco.com>
---

diff --git a/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/MDFlowMapping.xtend b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/MDFlowMapping.xtend
index bc6b88d9c8..1c9d06388e 100644
--- a/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/MDFlowMapping.xtend
+++ b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/MDFlowMapping.xtend
@@ -146,6 +146,7 @@ public class MDFlowMapping {
     public static def removeFlowInput(Node sourceNode, Flow sourceFlow) {
         val source = flowAdded(sourceFlow);
         val it = new RemoveFlowInputBuilder(source as org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.Flow);
+        node = sourceNode.toNodeRef()
         return it.build();
     }