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

guard stack remove with isEmpty #3830

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

guard stack remove with isEmpty #3830

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions apm-agent-core/src/main/java/co/elastic/apm/agent/impl/ActiveStack.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,9 @@ boolean deactivate(TraceStateImpl<?> context, List<ActivationListener> activatio
}

TraceStateImpl<?> activeContext = currentContext();
activeContextStack.remove();
if (!activeContextStack.isEmpty()) {
activeContextStack.remove();
}

try {
assertIsActive(context, activeContext, assertionsEnabled);
Expand Down Expand Up @@ -185,7 +187,9 @@ <T extends TraceStateImpl<T>> T wrapActiveContextIfRequired(Class<T> wrapperClas

// replace the currently active on the stack, however currentContext() will make sure to return the original
// context in order to keep wrapping transparent.
activeContextStack.remove();
if (!activeContextStack.isEmpty()) {
activeContextStack.remove();
}
activeContextStack.push(wrapper);

return wrapped;
Expand Down
Loading