commit f553ac436a715585bbe95bdc69afcb3a1457f406
author rohitsharan <r.sharan@samsung.com> Thu Apr 13 17:39:25 2017 +0530
committer Jonathan Hart <jono@onlab.us> Thu Apr 27 16:15:30 2017 +0000
tree 18d248fe6f1ba6b87a2685eb367c58737de65299
parent c2e7736cf49c63b5af60ad52ff786a0e5e27da17

onos-6299: Possible null pointe dereference in linkconverter

Change-Id: I68ba0654e4da7dbca63111fcb2eaf893d6b5cb7b

apps/tenbi/utils/src/main/java/org/onosproject/teyang/utils/topology/LinkConverter.java

diff --git a/apps/tenbi/utils/src/main/java/org/onosproject/teyang/utils/topology/LinkConverter.java b/apps/tenbi/utils/src/main/java/org/onosproject/teyang/utils/topology/LinkConverter.java
index 8869110..454f971 100644
--- a/apps/tenbi/utils/src/main/java/org/onosproject/teyang/utils/topology/LinkConverter.java
+++ b/apps/tenbi/utils/src/main/java/org/onosproject/teyang/utils/topology/LinkConverter.java
@@ -730,32 +730,34 @@
                 }
             }
 
-            TeNodeId teSupportNodeId = findTeNodeId(teNetworkFound,
+            if (teLinkFound != null) {
+                TeNodeId teSupportNodeId = findTeNodeId(teNetworkFound,
                                                     teLinkFound.source().sourceNode());
-            long tenIdLong = -1;
-            if (teSupportNodeId != null) {
-                tenIdLong = Ip4Address.valueOf(teSupportNodeId.dottedQuad().string()).toInt();
-            }
-            long teSupportLinkTpId = findTeTpId(teNetworkFound,
-                                                teLinkFound.source().sourceNode(),
-                                                teLinkFound.source().sourceTp());
+                long tenIdLong = -1;
+                if (teSupportNodeId != null) {
+                    tenIdLong = Ip4Address.valueOf(teSupportNodeId.dottedQuad().string()).toInt();
+                }
+                long teSupportLinkTpId = findTeTpId(teNetworkFound,
+                                                    teLinkFound.source().sourceNode(),
+                                                    teLinkFound.source().sourceTp());
 
-            org.onosproject.tetopology.management.api.TeTopologyId teTopologyId = null;
-            if (teNetworkFound.yangAugmentedInfo(AugmentedNwNetwork.class) != null) {
-                AugmentedNwNetwork augmentTeIds =
-                        (AugmentedNwNetwork) teNetworkFound.yangAugmentedInfo(AugmentedNwNetwork.class);
-                teTopologyId =
-                        new org.onosproject.tetopology.management.api.TeTopologyId(
-                                augmentTeIds.clientId().uint32(),
-                                augmentTeIds.providerId().uint32(),
-                                augmentTeIds.teTopologyId().string());
-            }
+                org.onosproject.tetopology.management.api.TeTopologyId teTopologyId = null;
+                if (teNetworkFound.yangAugmentedInfo(AugmentedNwNetwork.class) != null) {
+                    AugmentedNwNetwork augmentTeIds =
+                            (AugmentedNwNetwork) teNetworkFound.yangAugmentedInfo(AugmentedNwNetwork.class);
+                    teTopologyId =
+                            new org.onosproject.tetopology.management.api.TeTopologyId(
+                                    augmentTeIds.clientId().uint32(),
+                                    augmentTeIds.providerId().uint32(),
+                                    augmentTeIds.teTopologyId().string());
+                }
 
-            supportTeLinkId = new TeLinkTpGlobalKey(teTopologyId.providerId(),
-                                                    teTopologyId.clientId(),
-                                                    Long.valueOf(teTopologyId
-                                                            .topologyId()),
-                                                    tenIdLong, teSupportLinkTpId);
+                supportTeLinkId = new TeLinkTpGlobalKey(teTopologyId.providerId(),
+                                                        teTopologyId.clientId(),
+                                                        Long.valueOf(teTopologyId
+                                                                .topologyId()),
+                                                        tenIdLong, teSupportLinkTpId);
+            }
         }
 
         return supportTeLinkId;