From cf3ae735b2f6cca4ea48cd494f3ccf8f42f50e5b Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Wed, 23 Sep 2015 14:43:16 +0100
Subject: [PATCH] Fix test (exclude commons refresh processing if not
 available)

---
 .../EurekaDiscoveryClientConfiguration.java     | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClientConfiguration.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClientConfiguration.java
index 582a6854..df4c3666 100644
--- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClientConfiguration.java
+++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClientConfiguration.java
@@ -158,11 +158,18 @@ public class EurekaDiscoveryClientConfiguration implements SmartLifecycle, Order
 		EurekaDiscoveryClientConfiguration.this.start();
 	}
 
-	@EventListener(EnvironmentChangeEvent.class)
-	public void onApplicationEvent(EnvironmentChangeEvent event) {
-		// register in case meta data changed
-		stop();
-		start();
+	@Configuration
+	@ConditionalOnClass(EnvironmentChangeEvent.class)
+	protected static class EurekaClientConfigurationRefresher {
+		@Autowired
+		private EurekaDiscoveryClientConfiguration clientConfig;
+
+		@EventListener(EnvironmentChangeEvent.class)
+		public void onApplicationEvent(EnvironmentChangeEvent event) {
+			// register in case meta data changed
+			this.clientConfig.stop();
+			this.clientConfig.start();
+		}
 	}
 
 	@EventListener(ContextClosedEvent.class)