commit | 152f9fdf30ad7664cef8b3ed5ab3bdbd69e14afc | [log] [tgz] |
---|---|---|
author | Thomas Vachuska <tom@onlab.us> | Thu Apr 02 16:28:13 2015 -0700 |
committer | Gerrit Code Review <gerrit@onlab.us> | Fri Apr 03 00:01:31 2015 +0000 |
tree | 3f775451b52bc48f70ae52f0ff4d27e2781ed751 | |
parent | ae65c96f5b305a39535c21e66bf260b31b5e29af [diff] [blame] |
Shutdown cleanup; hunt for exceptions continues Change-Id: I8cbfaec0820d63f5122a82dd25ba249ba1f690a4
diff --git a/core/store/dist/src/main/java/org/onosproject/store/ecmap/EventuallyConsistentMapImpl.java b/core/store/dist/src/main/java/org/onosproject/store/ecmap/EventuallyConsistentMapImpl.java index 62d145d..cf652ff 100644 --- a/core/store/dist/src/main/java/org/onosproject/store/ecmap/EventuallyConsistentMapImpl.java +++ b/core/store/dist/src/main/java/org/onosproject/store/ecmap/EventuallyConsistentMapImpl.java
@@ -498,7 +498,7 @@ return; } - if (underHighLoad()) { + if (underHighLoad() || destroyed) { return; } @@ -700,10 +700,13 @@ } } - private final class InternalEventListener implements - ClusterMessageHandler { + private final class InternalEventListener implements ClusterMessageHandler { @Override public void handle(ClusterMessage message) { + if (destroyed) { + return; + } + log.debug("Received update event from peer: {}", message.sender()); Collection<AbstractEntry<K, V>> events = serializer.decode(message.payload());