From 769c6a00e7aab547706b90a48d780824dac18272 Mon Sep 17 00:00:00 2001
From: Jakub Toth <jatoth@cisco.com>
Date: Tue, 4 Oct 2016 14:02:06 +0200
Subject: [PATCH] Fix close() in provider

 *added condition on get() from handler

Change-Id: I45c89c44585dc1e5e3ae685eba8d6033ea2e171f
Signed-off-by: Jakub Toth <jatoth@cisco.com>
---
 .../java/org/opendaylight/restconf/RestConnectorProvider.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/RestConnectorProvider.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/RestConnectorProvider.java
index 418c9333e2..cc14b7f332 100644
--- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/RestConnectorProvider.java
+++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/RestConnectorProvider.java
@@ -113,8 +113,8 @@ public class RestConnectorProvider implements Provider, RestConnector, AutoClose
         }
 
         // close transaction chain
-        if (RestConnectorProvider.transactionChainHandler != null) {
-            RestConnectorProvider.transactionChainHandler.get().close();
+        if ((transactionChainHandler != null) && (transactionChainHandler.get() != null)) {
+            transactionChainHandler.get().close();
         }
     }
 }
-- 
2.36.6