commit 88375780322654d1641ed913c98c49e6b524c302
author Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Tue Dec 02 14:21:17 2014 -0800
committer Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Tue Dec 02 14:21:50 2014 -0800
tree bc8a862b671b24c24074d0e3327a1502f233f4e7
parent 722dfc714f372aa96353fb5978cb1f1a2474cb40

HazelcastIntentStore: fix NPE on state remove event

Change-Id: I03d52fd3151f734bb8e420ba9b0172078ca8a727

core/store/dist/src/main/java/org/onlab/onos/store/intent/impl/HazelcastIntentStore.java

diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/intent/impl/HazelcastIntentStore.java b/core/store/dist/src/main/java/org/onlab/onos/store/intent/impl/HazelcastIntentStore.java
index 2c1b50d..486e32f 100644
--- a/core/store/dist/src/main/java/org/onlab/onos/store/intent/impl/HazelcastIntentStore.java
+++ b/core/store/dist/src/main/java/org/onlab/onos/store/intent/impl/HazelcastIntentStore.java
@@ -586,7 +586,10 @@
                               intentId, oldState);
                 }
 
-                notifyDelegate(IntentEvent.getEvent(event.getValue(), getIntent(intentId)));
+                if (event.getValue() != null) {
+                    // notify if this is not entry removed event
+                    notifyDelegate(IntentEvent.getEvent(event.getValue(), getIntent(intentId)));
+                }
             }
         }
     }