You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2020/04/25 01:18:07 UTC
[skywalking] branch master updated: fix: IgnoredTraceContext
continue (#4709) (#4710)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 4acf0eb fix: IgnoredTraceContext continue (#4709) (#4710)
4acf0eb is described below
commit 4acf0ebc95a12d881081f17847b043d8380fda57
Author: qiyang <15...@163.com>
AuthorDate: Sat Apr 25 09:17:44 2020 +0800
fix: IgnoredTraceContext continue (#4709) (#4710)
Co-authored-by: 亓杨 <qi...@enmonster.com>
---
.../org/apache/skywalking/apm/agent/core/context/ContextSnapshot.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextSnapshot.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextSnapshot.java
index dde36c5..9db53a1 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextSnapshot.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/ContextSnapshot.java
@@ -50,7 +50,7 @@ public class ContextSnapshot {
}
public boolean isFromCurrent() {
- return traceSegmentId.equals(ContextManager.capture().getTraceSegmentId());
+ return traceSegmentId != null && traceSegmentId.equals(ContextManager.capture().getTraceSegmentId());
}
public CorrelationContext getCorrelationContext() {