From d7929943a38ca708612bfb20cc204654040028e5 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <marcin@grzejszczak.pl>
Date: Mon, 1 Aug 2016 17:52:17 -0700
Subject: [PATCH] Fixed circular dependency

fixes #354
---
 .../cloud/sleuth/instrument/web/TraceWebMvcConfigurer.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebMvcConfigurer.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebMvcConfigurer.java
index 35935a39b..c4b1861c3 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebMvcConfigurer.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebMvcConfigurer.java
@@ -32,7 +32,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
  */
 @Configuration
 class TraceWebMvcConfigurer extends WebMvcConfigurerAdapter {
-	@Autowired TraceHandlerInterceptor traceHandlerInterceptor;
+	@Autowired BeanFactory beanFactory;
 
 	@Bean
 	public TraceHandlerInterceptor traceHandlerInterceptor(BeanFactory beanFactory) {
@@ -41,6 +41,6 @@ class TraceWebMvcConfigurer extends WebMvcConfigurerAdapter {
 
 	@Override
 	public void addInterceptors(InterceptorRegistry registry) {
-		registry.addInterceptor(this.traceHandlerInterceptor);
+		registry.addInterceptor(this.beanFactory.getBean(TraceHandlerInterceptor.class));
 	}
 }