commit 17cda01c9baf5cf28fa3314d6a807b2eddd40853
author zhiyong ke <ke.zhiyong@zte.com.cn> Tue Apr 18 19:44:52 2017 +0800
committer Ray Milkey <ray@onlab.us> Tue Mar 28 18:59:40 2017 +0000
tree 7b5c2e0f866a5b9910cc91e3596f2348115fcd81
parent 2b3c69c17df5f7cb59355ee8696978153f3f1f2a

Fixes ONOS-6176 - -r option throws an exception for bandwidth allocation for point to point intent

Change-Id: Ib8f5adf1862abb300a3113e9ffd8b34b25730d3c

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 0a3256c..cdca955 100644
--- a/cli/src/main/java/org/onosproject/cli/net/ConnectivityIntentCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/ConnectivityIntentCommand.java
@@ -419,12 +419,9 @@
         if (resourceGroupId != null) {
             if (resourceGroupId.toLowerCase().startsWith("0x")) {
                 return ResourceGroup.of(Long.parseUnsignedLong(resourceGroupId.substring(2), 16));
-            } else {
-                return ResourceGroup.of(resourceGroupId);
             }
-        } else {
-            return null;
         }
+        return ResourceGroup.of(resourceGroupId);
     }
 
     /**