From 48ac636b8ce81ed296200cc587a9c1d60b9be044 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@pivotal.io>
Date: Tue, 13 Feb 2018 15:34:22 +0100
Subject: [PATCH] Not closing a span if it got already closed; fixes gh-842

---
 .../sleuth/instrument/scheduling/TraceSchedulingAspect.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/scheduling/TraceSchedulingAspect.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/scheduling/TraceSchedulingAspect.java
index 75214ce20..01e16d348 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/scheduling/TraceSchedulingAspect.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/scheduling/TraceSchedulingAspect.java
@@ -72,7 +72,10 @@ public class TraceSchedulingAspect {
 			return pjp.proceed();
 		}
 		finally {
-			this.tracer.close(span);
+			// #842 - the span might have already been closed
+			if (this.tracer.isTracing()) {
+				this.tracer.close(span);
+			}
 		}
 	}