commit 428e3a878341cb6db5a01ea3c0e6a636ef3afb7e
author Sandhya Sundaresan <sandhya@apache.org> Tue Jun 25 21:03:09 2019 +0000
committer Sandhya Sundaresan <sandhya@apache.org> Tue Jun 25 21:03:09 2019 +0000
tree 112108be25f546bf5bdf90849a35f8294f8e4b2c
parent da6da2b7a4663aec1982f53ab109544cd33c69fe

Review comments #3
(cherry picked from commit 3d51aa8deaae85daa937ed06d23533b9efd940e1)

core/sql/cli/Globals.cpp

diff --git a/core/sql/cli/Globals.cpp b/core/sql/cli/Globals.cpp
index e07d08a..a3e9a75 100644
--- a/core/sql/cli/Globals.cpp
+++ b/core/sql/cli/Globals.cpp
@@ -620,7 +620,8 @@
            newContext == tsCurrentContextMap->context_)
      return 0;
   if (newContext == defaultContext_)
-    tsCurrentContextMap = NULL;
+    if (tsCurrentContextMap)
+      tsCurrentContextMap->context_ = NULL;
   retcode = currContext()->getTransaction()->suspendTransaction();
   if (retcode != 0)
      return retcode;