Merge pull request #1080 from qiangdavidliu/master

one more change to relax parsing compatibility due to overiddenstatus casing change
Netflix · Jun 1, 2018 · b988850 · b988850
2 parents 72fcd28 + 2075f18
commit b988850
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/eureka-client/src/main/java/com/netflix/appinfo/InstanceInfo.java b/eureka-client/src/main/java/com/netflix/appinfo/InstanceInfo.java
@@ -181,6 +181,7 @@ public InstanceInfo(
             @JsonProperty("hostName") String hostName,
             @JsonProperty("status") InstanceStatus status,
             @JsonProperty("overriddenstatus") InstanceStatus overriddenStatus,
+            @JsonProperty("overriddenStatus") InstanceStatus overriddenStatusAlt,
             @JsonProperty("leaseInfo") LeaseInfo leaseInfo,
             @JsonProperty("isCoordinatingDiscoveryServer") Boolean isCoordinatingDiscoveryServer,
             @JsonProperty("metadata") HashMap<String, String> metadata,
@@ -207,7 +208,7 @@ public InstanceInfo(
         this.dataCenterInfo = dataCenterInfo;
         this.hostName = hostName;
         this.status = status;
-        this.overriddenStatus = overriddenStatus;
+        this.overriddenStatus = overriddenStatus == null ? overriddenStatusAlt : overriddenStatus;
         this.leaseInfo = leaseInfo;
         this.isCoordinatingDiscoveryServer = isCoordinatingDiscoveryServer;
         this.lastUpdatedTimestamp = lastUpdatedTimestamp;