Repository: cxf Updated Branches: refs/heads/master e25fd09f8 -> 7a0736b8f
CXF-6643: Upgraded Apache HTrace to 4.0 release branch. Minor fixes. Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7a0736b8 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7a0736b8 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7a0736b8 Branch: refs/heads/master Commit: 7a0736b8f1adb1a1b64ca15d1b03bedb175a41de Parents: e25fd09 Author: reta <[email protected]> Authored: Tue Oct 20 20:39:36 2015 -0400 Committer: reta <[email protected]> Committed: Tue Oct 20 20:39:36 2015 -0400 ---------------------------------------------------------------------- .../java/org/apache/cxf/tracing/htrace/AbstractHTraceProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/7a0736b8/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/AbstractHTraceProvider.java ---------------------------------------------------------------------- diff --git a/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/AbstractHTraceProvider.java b/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/AbstractHTraceProvider.java index 952b12f..5fe2e20 100644 --- a/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/AbstractHTraceProvider.java +++ b/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/AbstractHTraceProvider.java @@ -48,7 +48,7 @@ public abstract class AbstractHTraceProvider extends AbstractTracingProvider { final SpanId spanId = getFirstValueOrDefault(requestHeaders, getSpanIdHeader(), SpanId.INVALID); TraceScope traceScope = null; - if (spanId == SpanId.INVALID) { + if (SpanId.INVALID.equals(spanId)) { traceScope = tracer.newScope(buildSpanDescription(path, method)); } else { traceScope = tracer.newScope(buildSpanDescription(path, method), spanId);
