commit 5d55ed4c167c0f5db75f185290260ed2ca657e8c
author Brian O'Connor <bocon@onlab.us> Mon Dec 01 18:27:47 2014 -0800
committer Brian O'Connor <bocon@onlab.us> Mon Dec 01 18:35:24 2014 -0800
tree 4f5fb5eb453d998f2376f3a75f5ce02a50b48d20
parent a44dda5333cec569b4be43aeb4709b81123ef01f

Bug fixes for Intent Manager

ONOS-343

Change-Id: I164c52b41080392c4b27a3969f270171558599a6

core/net/src/main/java/org/onlab/onos/net/intent/impl/IntentManager.java

diff --git a/core/net/src/main/java/org/onlab/onos/net/intent/impl/IntentManager.java b/core/net/src/main/java/org/onlab/onos/net/intent/impl/IntentManager.java
index c4008aa..b81f81f 100644
--- a/core/net/src/main/java/org/onlab/onos/net/intent/impl/IntentManager.java
+++ b/core/net/src/main/java/org/onlab/onos/net/intent/impl/IntentManager.java
@@ -294,7 +294,7 @@
             // intents with the top-level intent and proceed to install.
             update.setInstallables(installables);
         } catch (PathNotFoundException e) {
-            log.debug("Path not found for intent {}", intent.id());
+            log.debug("Path not found for intent {}", intent);
         } catch (IntentException e) {
             log.warn("Unable to compile intent {} due to:", intent.id(), e);
 
@@ -606,6 +606,9 @@
                 oldInstallables = store.getInstallableIntents(oldIntent.id());
             } else {
                 oldInstallables = null;
+                if (newIntent == null) {
+                    log.info("Ignoring {} for Intent {}", op.type(), op.intentId());
+                }
             }
         }
 
@@ -853,8 +856,8 @@
          */
         private void processFutures() {
             if (future == null) {
-                log.warn("I have no Future.");
-                return; //FIXME look at this
+                // we are done if the future is null
+                return;
             }
             try {
                 CompletedBatchOperation completed = future.get(100, TimeUnit.NANOSECONDS);