Fix potential null-dereference in CommandHandler #1703

redis · Apr 7, 2021 · af60f59 · af60f59
1 parent dfacd06
commit af60f59
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/main/java/io/lettuce/core/protocol/CommandHandler.java b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
@@ -421,9 +421,15 @@ private void writeSingleCommand(ChannelHandlerContext ctx, RedisCommand<?, ?, ?>
                 span.tag("redis.args", command.getArgs().toCommandString());
             }
 
-            span.remoteEndpoint(tracedEndpoint);
+            if (tracedEndpoint != null) {
+                span.remoteEndpoint(tracedEndpoint);
+            } else {
+                span.remoteEndpoint(clientResources.tracing().createEndpoint(ctx.channel().remoteAddress()));
+            }
             span.start();
-            provider.setSpan(span);
+            if (provider != null) {
+                provider.setSpan(span);
+            }
 
             CompleteableCommand<?> completeableCommand = (CompleteableCommand<?>) command;
             completeableCommand.onComplete((o, throwable) -> {