commit | 7b652ad97c053d807861008534d32857ea5900f0 | [log] [tgz] |
---|---|---|
author | Thomas Vachuska <tom@onlab.us> | Thu Oct 30 14:10:51 2014 -0700 |
committer | Thomas Vachuska <tom@onlab.us> | Thu Oct 30 14:10:51 2014 -0700 |
tree | de6b0258ad0839c44c2cf86b85ef77f51f261068 | |
parent | 8cd66a53aaf56f9342331a5e3cd7caafcdcaab43 [diff] [blame] |
Fixed some javadoc warning/errors. Fixed NPE error in objective tracker. Preparing for upgrade to Java 8 and Karaf 3.0.2.
diff --git a/core/net/src/main/java/org/onlab/onos/net/intent/impl/ObjectiveTracker.java b/core/net/src/main/java/org/onlab/onos/net/intent/impl/ObjectiveTracker.java index d080b72..53b1239 100644 --- a/core/net/src/main/java/org/onlab/onos/net/intent/impl/ObjectiveTracker.java +++ b/core/net/src/main/java/org/onlab/onos/net/intent/impl/ObjectiveTracker.java
@@ -135,6 +135,11 @@ @Override public void run() { + // If there is no delegate, why bother? Just bail. + if (delegate == null) { + return; + } + if (event.reasons() == null) { delegate.triggerCompile(new HashSet<IntentId>(), true);