commit ca2f369cb26e615d17a5f3f4dc2345d2d9db987f
author nitinanand <nitin.anand@samsung.com> Mon Apr 10 10:21:13 2017 +0530
committer GauravAgrawal-Huawei <gauravjbp3ster@gmail.com> Tue Apr 11 08:45:09 2017 +0000
tree 7516e5f12662b257c9b80e686fc1c6d25ab48788
parent f702168f1e6a9a1cecb9e15d0366e8700b4f2aaf

[ONOS-6246] Fix for Misplaced null check for YdtBuilder object

Change-Id: I27a226be91fc237e20636897338841684317d47b

apps/yms/app/src/main/java/org/onosproject/yms/app/ych/DefaultYangCodecHandler.java

diff --git a/apps/yms/app/src/main/java/org/onosproject/yms/app/ych/DefaultYangCodecHandler.java b/apps/yms/app/src/main/java/org/onosproject/yms/app/ych/DefaultYangCodecHandler.java
index 266b391..44c2f72 100644
--- a/apps/yms/app/src/main/java/org/onosproject/yms/app/ych/DefaultYangCodecHandler.java
+++ b/apps/yms/app/src/main/java/org/onosproject/yms/app/ych/DefaultYangCodecHandler.java
@@ -223,6 +223,10 @@
                                                        schemaRegistry,
                                                        opType);
 
+        if (ydtBuilder == null) {
+                return null;
+        }
+
         YdtExtendedContext rootNode = ((YdtExtendedContext) ydtBuilder
                 .getRootNode());
 
@@ -231,12 +235,8 @@
                     .getFirstChild()));
         }
 
-        // Get the module object by using YANG data tree
-        if (ydtBuilder != null) {
-            return getObjectList(ydtBuilder.getRootNode());
-        }
-
-        return null;
+        // Return the module object by using YANG data tree
+        return getObjectList(rootNode);
     }
 
     //returns notification event object