From b235234170d04a4f8f1ad8c6c8b9b099d0dda219 Mon Sep 17 00:00:00 2001
From: Michal Rehak <mirehak@cisco.com>
Date: Mon, 28 Apr 2014 11:38:39 +0200
Subject: [PATCH] fix for BUG 782 - NPE in ErrorTranslator during handshake

- there is no session available before registration

Signed-off-by: Michal Rehak <mirehak@cisco.com>
Change-Id: Ib0e420a879c6512e5f86003ad9d024aee789c04d
---
 .../md/core/translator/AbstractErrorTranslator.java         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/AbstractErrorTranslator.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/AbstractErrorTranslator.java
index b71da45703..139656a13a 100644
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/AbstractErrorTranslator.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/AbstractErrorTranslator.java
@@ -65,7 +65,11 @@ public abstract class AbstractErrorTranslator implements IMDMessageTranslator<Of
 
             nodeErrBuilder.setTransactionId(new TransactionId(BigInteger.valueOf(message.getXid())));
 
-            Object object = sc.getbulkTransactionCache().getIfPresent(new TransactionKey(message.getXid()));
+            Object object = null;
+            if (sc != null) {
+                // sessionContext is available only after handshake finished
+                object = sc.getbulkTransactionCache().getIfPresent(new TransactionKey(message.getXid()));
+            }
 
             Uri uri = null;
             ObjectReference objRef = null;
-- 
2.36.6