commit 7056a0440f4f21db67969966dcc90d836b2305ae
author You Wang <you@onlab.us> Fri Apr 07 14:43:14 2017 -0700
committer You Wang <you@onlab.us> Fri Apr 07 14:48:56 2017 -0700
tree f4ad6ac49af77ad7a1fdde6dddeedd279d2d61aa
parent 06eeaed16f2e2d48317e39f57f9c69cb60881e29

Fix NullPointerException when resourceGroupId is null

Change-Id: I02ea762de6182e3b2d2b82afa6cc3f6be41f5e51

cli/src/main/java/org/onosproject/cli/net/ConnectivityIntentCommand.java

diff --git a/cli/src/main/java/org/onosproject/cli/net/ConnectivityIntentCommand.java b/cli/src/main/java/org/onosproject/cli/net/ConnectivityIntentCommand.java
index cdca955..12b0a71 100644
--- a/cli/src/main/java/org/onosproject/cli/net/ConnectivityIntentCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/ConnectivityIntentCommand.java
@@ -420,8 +420,9 @@
             if (resourceGroupId.toLowerCase().startsWith("0x")) {
                 return ResourceGroup.of(Long.parseUnsignedLong(resourceGroupId.substring(2), 16));
             }
+            return ResourceGroup.of(resourceGroupId);
         }
-        return ResourceGroup.of(resourceGroupId);
+        return null;
     }
 
     /**