commit 9285dbd0a462b69f60c9ef16efc36e700a67487d
author Jordan Halterman <jordan.halterman@gmail.com> Thu Mar 07 15:52:34 2019 -0800
committer Jordan Halterman <jordan@opennetworking.org> Thu Mar 07 22:14:13 2019 -0800
tree 04e09fb7a4147f248bee26a22af4d98eefe54801
parent 196a9ca354542e2cc114d9ac54208ab753a64a9a

Fix NPE in flow store

Change-Id: If240d2f02c96b3f03398b8ec30a7feb7bb9240b4

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

diff --git a/core/store/dist/src/main/java/org/onosproject/store/flow/impl/DeviceFlowTable.java b/core/store/dist/src/main/java/org/onosproject/store/flow/impl/DeviceFlowTable.java
index 7b43f33..4cece1b 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/flow/impl/DeviceFlowTable.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/flow/impl/DeviceFlowTable.java
@@ -761,7 +761,8 @@
      * Handles an update to a term.
      */
     private void updateTerm(DeviceReplicaInfo replicaInfo) {
-        if (replicaInfo.term() == this.replicaInfo.term()) {
+        DeviceReplicaInfo oldReplicaInfo = this.replicaInfo;
+        if (oldReplicaInfo != null && replicaInfo.term() == oldReplicaInfo.term()) {
             this.replicaInfo = replicaInfo;
 
             // If the local node is neither the master or a backup for the device *and the term is active*,