SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.2.x'

Browse Source
This commit is contained in:
Marcin Grzejszczak
2017-07-12 18:51:46 +02:00
parent 2a38230bb6 be81264398
commit 7a7cacb7c5
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceAsyncRestTemplate.java
View File

@@ -98,7 +98,10 @@ public class TraceAsyncRestTemplate extends AsyncRestTemplate {
this.errorParser));
// potential race can happen here
if (span != null && span.equals(this.tracer.getCurrentSpan())) {
this.tracer.detach(span);
Span parent = this.tracer.detach(span);
if (parent != null) {
this.tracer.continueSpan(parent);
}
}
return new ListenableFuture<T>() {
@@ -287,9 +290,4 @@ public class TraceAsyncRestTemplate extends AsyncRestTemplate {
return this.tracer.isTracing();
}
}
}