[camel] branch main updated: CAMEL-17655: Fix NPE in camel-opentracing

[davsclaus]

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

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


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

commit cf6c9488fc0f834ceec99e1c9229ffc814116a27
Author: Claus Ibsen <claus.ib...@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 bd36b4d..0d980c6 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
@@ -53,12 +53,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);