commit c10a9488e362da25d3206c8f219e1f46fa982a9b
author Thomas Vachuska <tom@onlab.us> Wed Aug 03 10:31:11 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Wed Aug 03 18:15:17 2016 +0000
tree 2add554948e20f1217a5d288f82c13ceaa718731
parent 4b0221198bccdc4f96022a9a7f5a3fff81455d92

Fixed potential NPE in flow store.

Change-Id: Id4f7887ddf4826f556a62e1a1cd395bc22e882f2

core/store/dist/src/main/java/org/onosproject/store/flow/impl/DistributedFlowRuleStore.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/flow/impl/DistributedFlowRuleStore.java b/core/store/dist/src/main/java/org/onosproject/store/flow/impl/DistributedFlowRuleStore.java
index b2860b1..368c06d 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/flow/impl/DistributedFlowRuleStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/flow/impl/DistributedFlowRuleStore.java
@@ -745,7 +745,7 @@
                             Sets.difference(deviceFlowEntries.keySet(), backedupDevices);
                         if (devicesNotBackedup.size() > 0) {
                             log.warn("Failed to backup devices: {}. Reason: {}",
-                                     devicesNotBackedup, error.getMessage());
+                                     devicesNotBackedup, error != null ? error.getMessage() : "none");
                         }
                         if (backedupDevices != null) {
                             backedupDevices.forEach(id -> {