commit e76f0c8559d1644dd530ff32befc576a8049b1e3
author Jordan Halterman <jordan@opennetworking.org> Mon Jun 18 17:44:48 2018 -0700
committer Jordan Halterman <jordan@opennetworking.org> Tue Jun 19 18:58:30 2018 +0000
tree f37ea024d56daf01221477e23d579a9af611c33b
parent 4f55c67c98a89717c4951b90c56048abdfe993c4

Fix NPE in ClusterCommunicationManager exception handling

Change-Id: I4dd3c6aeb3150e117e2ba414c8d2a58adef79170
(cherry picked from commit 7b3830bef35b703ba411684f1f10c291d5a22f61)

core/store/dist/src/main/java/org/onosproject/store/cluster/messaging/impl/ClusterCommunicationManager.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/cluster/messaging/impl/ClusterCommunicationManager.java b/core/store/dist/src/main/java/org/onosproject/store/cluster/messaging/impl/ClusterCommunicationManager.java
index f605289..e160326 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/cluster/messaging/impl/ClusterCommunicationManager.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/cluster/messaging/impl/ClusterCommunicationManager.java
@@ -278,7 +278,7 @@
                     return result;
                 } catch (Exception e) {
                     context.stop(e);
-                    Throwables.throwIfUnchecked(e.getCause());
+                    Throwables.throwIfUnchecked(Throwables.getRootCause(e));
                     throw new IllegalStateException(e.getCause());
                 }
             }