From 800acce4bd10ff964de8440db203182d79b530d5 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@gopivotal.com>
Date: Fri, 11 Jul 2014 17:03:21 +0100
Subject: [PATCH] Add @Conditionals to EurekaClientAutoConfiguration

---
 .../netflix/eureka/EurekaClientAutoConfiguration.java        | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/org/springframework/platform/netflix/eureka/EurekaClientAutoConfiguration.java b/src/main/java/org/springframework/platform/netflix/eureka/EurekaClientAutoConfiguration.java
index 88774dd3..5206ae6b 100644
--- a/src/main/java/org/springframework/platform/netflix/eureka/EurekaClientAutoConfiguration.java
+++ b/src/main/java/org/springframework/platform/netflix/eureka/EurekaClientAutoConfiguration.java
@@ -19,6 +19,8 @@ import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.annotation.Configuration;
@@ -27,6 +29,7 @@ import org.springframework.context.event.ContextRefreshedEvent;
 import com.netflix.appinfo.ApplicationInfoManager;
 import com.netflix.appinfo.InstanceInfo.InstanceStatus;
 import com.netflix.discovery.DiscoveryManager;
+import com.netflix.discovery.EurekaClientConfig;
 
 /**
  * @author Dave Syer
@@ -34,6 +37,8 @@ import com.netflix.discovery.DiscoveryManager;
  */
 @Configuration
 @EnableConfigurationProperties({EurekaClientConfigBean.class, EurekaInstanceConfigBean.class})
+@ConditionalOnClass(EurekaClientConfig.class)
+@ConditionalOnExpression("${eureka.client.enabled:true}")
 public class EurekaClientAutoConfiguration implements ApplicationListener<ContextRefreshedEvent> {
 
 	@Autowired