[CBRD-21118] SA_MODE keep using the current error entry if neither an…

… error was set nor pushed (#599)
CUBRID · Mar 27, 2017 · 1744643 · 1744643
1 parent 23a6af7
commit 1744643
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/base/error_manager.c b/src/base/error_manager.c
@@ -2540,9 +2540,13 @@ er_stack_push_if_exists (void)
       return ER_FAILED;
     }
 
-  if (er_entry_p->err_id == NO_ERROR)
+  if (er_entry_p->err_id == NO_ERROR && er_entry_p->stack == NULL)
     {
-      /* When no error was set, keep using the current error entry. */
+      /* If neither an error was set nor pushed, keep using the current error entry.
+       *
+       * If this is not a base error entry,
+       * we have to push one since it means that caller pushed one and latest entry will be soon popped.
+       */
       return NO_ERROR;
     }