Fix potential null-dereference in CommandHandler #1703

redis · Apr 7, 2021 · b8433ba · b8433ba
1 parent 71e0fae
commit b8433ba
Showing 1 changed file with 16 additions and 11 deletions.
diff --git a/src/main/java/io/lettuce/core/protocol/CommandHandler.java b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
@@ -466,21 +466,26 @@ private void attachTracing(ChannelHandlerContext ctx, RedisCommand<?, ?, ?> comm
         TracedCommand<?, ?, ?> traced = CommandWrapper.unwrap(command, TracedCommand.class);
         TraceContextProvider provider = (traced == null ? clientResources.tracing().initialTraceContextProvider() : traced);
         Tracer tracer = clientResources.tracing().getTracerProvider().getTracer();
-        TraceContext context = provider.getTraceContext();
 
-        Tracer.Span span = tracer.nextSpan(context);
-        span.name(command.getType().name());
+        if (provider != null) {
 
-        if (tracedEndpoint != null) {
-            span.remoteEndpoint(tracedEndpoint);
-        } else {
-            span.remoteEndpoint(clientResources.tracing().createEndpoint(ctx.channel().remoteAddress()));
-        }
+            TraceContext context = provider.getTraceContext();
+
+            Tracer.Span span = tracer.nextSpan(context);
+            span.name(command.getType().name());
+
+            if (tracedEndpoint != null) {
+                span.remoteEndpoint(tracedEndpoint);
+            } else {
+                span.remoteEndpoint(clientResources.tracing().createEndpoint(ctx.channel().remoteAddress()));
+            }
 
-        span.start(command);
+            span.start(command);
 
-        if (traced != null) {
-            traced.setSpan(span);
+            if (traced != null) {
+                traced.setSpan(span);
+
+            }
         }
     }