commit d7d18005e83827a9586b3f35bbb0311bd4939e3a
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Wed Jan 21 14:37:14 2015 -0800
committer Ray Milkey <ray@onlab.us> Thu Jan 22 19:03:58 2015 +0000
tree 8610b4974c555980d2f674f2ffeed0dd9010462a
parent 166e61e47fbe1a8de32498b1160e0ffcbdf38d31

Prohibit null for resources field in Intent

Change-Id: I128c6e63ccccaf817e83ff1c440a731fb98b42f7

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

diff --git a/cli/src/main/java/org/onosproject/cli/net/IntentsListCommand.java b/cli/src/main/java/org/onosproject/cli/net/IntentsListCommand.java
index 59473ca..77a8bd6 100644
--- a/cli/src/main/java/org/onosproject/cli/net/IntentsListCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/IntentsListCommand.java
@@ -328,7 +328,7 @@
     }
 
     private void printDetails(IntentService service, Intent intent) {
-        if (intent.resources() != null && !intent.resources().isEmpty()) {
+        if (!intent.resources().isEmpty()) {
             print("    resources=%s", intent.resources());
         }
         if (intent instanceof ConnectivityIntent) {
@@ -392,7 +392,7 @@
             result.put("state", state.toString());
         }
 
-        if (intent.resources() != null && !intent.resources().isEmpty()) {
+        if (!intent.resources().isEmpty()) {
             ArrayNode rnode = mapper.createArrayNode();
             for (NetworkResource resource : intent.resources()) {
                 rnode.add(resource.toString());