You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2022/02/16 13:21:05 UTC

[camel] branch camel-3.14.x updated: CAMEL-17655: Fix NPE in camel-opentracing

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch camel-3.14.x
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/camel-3.14.x by this push:
     new b734369  CAMEL-17655: Fix NPE in camel-opentracing
b734369 is described below

commit b734369f720480e19abe599136a67e4533c6408e
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Feb 16 14:19:36 2022 +0100

    CAMEL-17655: Fix NPE in camel-opentracing
---
 .../java/org/apache/camel/opentracing/TagProcessor.java    | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/TagProcessor.java b/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/TagProcessor.java
index b72bde7..99cc7d3 100644
--- a/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/TagProcessor.java
+++ b/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/TagProcessor.java
@@ -52,12 +52,14 @@ public class TagProcessor extends AsyncProcessorSupport implements Traceable, Id
     public boolean process(Exchange exchange, AsyncCallback callback) {
         try {
             OpenTracingSpanAdapter camelSpan = (OpenTracingSpanAdapter) ActiveSpanManager.getSpan(exchange);
-            Span span = camelSpan.getOpenTracingSpan();
-            if (span != null) {
-                String tag = expression.evaluate(exchange, String.class);
-                span.setTag(tagName, tag);
-            } else {
-                LOG.warn("OpenTracing: could not find managed span for exchange={}", exchange);
+            if (camelSpan != null) {
+                Span span = camelSpan.getOpenTracingSpan();
+                if (span != null) {
+                    String tag = expression.evaluate(exchange, String.class);
+                    span.setTag(tagName, tag);
+                } else {
+                    LOG.warn("OpenTracing: cannot find managed span for exchange={}", exchange);
+                }
             }
         } catch (Exception e) {
             exchange.setException(e);