From 5140c50521336064a3a437322a7ea03b5289b3e9 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@pivotal.io>
Date: Fri, 5 Oct 2018 10:52:52 +0200
Subject: [PATCH] Fixing potential NPE

---
 .../annotation/SleuthSpanCreatorAspectWebFluxTests.java       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/annotation/SleuthSpanCreatorAspectWebFluxTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/annotation/SleuthSpanCreatorAspectWebFluxTests.java
index 68085203d..4fb052e9a 100644
--- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/annotation/SleuthSpanCreatorAspectWebFluxTests.java
+++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/annotation/SleuthSpanCreatorAspectWebFluxTests.java
@@ -258,7 +258,9 @@ public class SleuthSpanCreatorAspectWebFluxTests {
 
 		@Override
 		public void add(HttpTrace trace) {
-			spanIdsInHttpTrace.add(tracer.currentSpan().context().spanId());
+			if (tracer.currentSpan() != null) {
+				spanIdsInHttpTrace.add(tracer.currentSpan().context().spanId());
+			}
 		}
 
 	}