commit d972235b1b2e435df0d0d7b1fb0da1fddc040c48
author Satish K <satishk@huawei.com> Fri Nov 20 23:19:52 2015 +0530
committer Gerrit Code Review <gerrit@onlab.us> Tue Nov 24 18:51:44 2015 +0000
tree 75cfe8eb444645121ab847cc2a106500661c327f
parent 04e46123671a3a6975eddb1cd0dd2fa187affdb4

TunnelStore_functionalIssue

Change-Id: Id481538915efb2a4fa8196c3df07f0820acb904d

incubator/store/src/main/java/org/onosproject/incubator/store/tunnel/impl/DistributedTunnelStore.java

diff --git a/incubator/store/src/main/java/org/onosproject/incubator/store/tunnel/impl/DistributedTunnelStore.java b/incubator/store/src/main/java/org/onosproject/incubator/store/tunnel/impl/DistributedTunnelStore.java
index 0f48313..f0ad2b0 100644
--- a/incubator/store/src/main/java/org/onosproject/incubator/store/tunnel/impl/DistributedTunnelStore.java
+++ b/incubator/store/src/main/java/org/onosproject/incubator/store/tunnel/impl/DistributedTunnelStore.java
@@ -290,9 +290,10 @@
         TunnelSubscription order = new TunnelSubscription(appId, null, null, tunnelId, null, null,
                                 annotations);
         Tunnel result = tunnelIdAsKeyStore.get(tunnelId);
-        if (result != null || Tunnel.State.INACTIVE.equals(result.state())) {
+        if (result == null || Tunnel.State.INACTIVE.equals(result.state())) {
             return null;
         }
+
         orderSet.add(order);
         orderRelationship.put(appId, orderSet);
         return result;