commit 0677d88e2dd1a32f6239829e3b70a39fa2a634cc
author Jordan Halterman <jordan.halterman@gmail.com> Thu Mar 07 15:52:34 2019 -0800
committer Jordan Halterman <jordan.halterman@gmail.com> Thu Mar 07 16:34:39 2019 -0800
tree 825544f920205862ceda9b9e3f1ccf176c2c910d
parent b2e6be83e5f55613af2d9e570d1dd55810b21dd9

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 0008ac1..53b3cd6 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*,