Merge "Bug 4957 TxChainManager lifecycle startup cleaning"

[openflowplugin.git] / openflowplugin / src / main / java / org / opendaylight / openflowplugin / openflow / md / util / RoleUtil.java

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/util/RoleUtil.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/util/RoleUtil.java
index 8c9b49a6dd84526040995bd9f634afd337cbf5f0..f335f11ebd1ea38859f3bedbbb3fae55d491bd2d 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/util/RoleUtil.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/util/RoleUtil.java
@@ -123,7 +123,9 @@ public final class RoleUtil {
         Futures.addCallback(JdkFutureAdapters.listenInPoolThread(roleReply), new FutureCallback<RpcResult<RoleRequestOutput>>() {
             @Override
             public void onSuccess(RpcResult<RoleRequestOutput> input) {
-                result.set(input.getResult().getGenerationId());
+                if(input != null && input.getResult() != null) {
+                    result.set(input.getResult().getGenerationId());
+                }
             }
             @Override
             public void onFailure(Throwable t) {