From b5bd371d8c17ec22ad9d2e9ef266372e0c66a246 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Tue, 27 Jan 2015 07:26:48 +0000
Subject: [PATCH] Be defiensive about errors getting remote status

---
 .../cloud/netflix/eureka/server/EurekaController.java     | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaController.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaController.java
index a269ede09..4946a4ed6 100644
--- a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaController.java
+++ b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaController.java
@@ -58,7 +58,13 @@ public class EurekaController {
 	public String status(HttpServletRequest request, Map<String, Object> model) {
 		populateBase(request, model);
 		populateApps(model);
-		StatusInfo statusInfo = new StatusResource().getStatusInfo();
+		StatusInfo statusInfo;
+		try {
+			statusInfo = new StatusResource().getStatusInfo();
+		}
+		catch (Exception e) {
+			statusInfo = StatusInfo.Builder.newBuilder().isHealthy(false).build();
+		}
 		model.put("statusInfo", statusInfo);
 		populateInstanceInfo(model, statusInfo);
 		return "eureka/status";