Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from Mar 27, 2017
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/base/error_manager.c
View file
Open in desktop
Expand Up @@ -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;
}

Expand Down