Merge pull request #10 from opentracing/fix_debug_flag

Fix totally broken DebugAssertUseAfterFinish
ipfs · Mar 5, 2016 · 562a065 · 562a065
2 parents bfc68f5 + 22c98bb
commit 562a065
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/span.go b/span.go
@@ -119,9 +119,13 @@ func (s *spanImpl) FinishWithOptions(opts opentracing.FinishOptions) {
 	if s.tracer.Options.DebugAssertUseAfterFinish {
 		// This makes it much more likely to catch a panic on any subsequent
 		// operation since s.tracer is accessed on every call to `Lock`.
+		pool := s.tracer.spanPool
 		s.reset()
+		pool.Put(s)
+	} else {
+		s.tracer.spanPool.Put(s)
 	}
-	s.tracer.spanPool.Put(s)
+
 }
 
 func (s *spanImpl) SetBaggageItem(restrictedKey, val string) opentracing.Span {