From: Vivek Srivastava <vivek.v.srivastava@ericsson.com>
Date: Wed, 27 May 2015 07:14:37 +0000 (+0000)
Subject: Merge "Fix for bug 3357, handled update on vpn interface"
X-Git-Tag: release/lithium~9
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=755c4931cfeaab0ac2783b909572d00386b804f9;hp=8e7149129d3918e86e9b8c7866c8df0d22d536d4;p=vpnservice.git

Merge "Fix for bug 3357, handled update on vpn interface"
---

diff --git a/nexthopmgr/nexthopmgr-impl/src/main/java/org/opendaylight/vpnservice/nexthopmgr/NexthopManager.java b/nexthopmgr/nexthopmgr-impl/src/main/java/org/opendaylight/vpnservice/nexthopmgr/NexthopManager.java
index bd767cbe..052ed98f 100644
--- a/nexthopmgr/nexthopmgr-impl/src/main/java/org/opendaylight/vpnservice/nexthopmgr/NexthopManager.java
+++ b/nexthopmgr/nexthopmgr-impl/src/main/java/org/opendaylight/vpnservice/nexthopmgr/NexthopManager.java
@@ -417,7 +417,7 @@ public class NexthopManager implements L3nexthopService, AutoCloseable {
 
         String endpointIp = interfaceManager.getEndpointIpForDpn(input.getDpnId());
         LOG.trace("getEgressPointer: input {}, endpointIp {}", input, endpointIp);
-        if (input.getNexthopIp().equals(endpointIp)) {
+        if (input.getNexthopIp() == null || input.getNexthopIp().equals(endpointIp)) {
             VpnNexthop vpnNextHop = getVpnNexthop(input.getVpnId(), input.getIpPrefix(), 5);
             output.setEgressPointer(vpnNextHop.getEgressPointer());
             output.setLocalDestination(true);