From e76f0c8559d1644dd530ff32befc576a8049b1e3 Mon Sep 17 00:00:00 2001
From: Jordan Halterman <jordan@opennetworking.org>
Date: Mon, 18 Jun 2018 17:44:48 -0700
Subject: [PATCH] Fix NPE in ClusterCommunicationManager exception handling

Change-Id: I4dd3c6aeb3150e117e2ba414c8d2a58adef79170
(cherry picked from commit 7b3830bef35b703ba411684f1f10c291d5a22f61)
---
 .../cluster/messaging/impl/ClusterCommunicationManager.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 f605289cb9..e1603263d6 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 @@ public class ClusterCommunicationManager implements ClusterCommunicationService
                     return result;
                 } catch (Exception e) {
                     context.stop(e);
-                    Throwables.throwIfUnchecked(e.getCause());
+                    Throwables.throwIfUnchecked(Throwables.getRootCause(e));
                     throw new IllegalStateException(e.getCause());
                 }
             }