From ce82ea3b71dbeef41ce2926643ab73146336c96f Mon Sep 17 00:00:00 2001 From: spencergibb Date: Mon, 2 Nov 2020 12:57:40 -0500 Subject: [PATCH] Updates equals() for events. Fixes gh-3918 --- .../eureka/server/event/EurekaInstanceCanceledEvent.java | 5 +++-- .../eureka/server/event/EurekaInstanceRegisteredEvent.java | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/EurekaInstanceCanceledEvent.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/EurekaInstanceCanceledEvent.java index 0295ae2cd..e92501bfd 100644 --- a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/EurekaInstanceCanceledEvent.java +++ b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/EurekaInstanceCanceledEvent.java @@ -74,8 +74,9 @@ public class EurekaInstanceCanceledEvent extends ApplicationEvent { return false; } EurekaInstanceCanceledEvent that = (EurekaInstanceCanceledEvent) o; - return Objects.equals(appName, that.appName) - && Objects.equals(serverId, that.serverId) && replication == replication; + return this.replication == that.replication + && Objects.equals(this.appName, that.appName) + && Objects.equals(this.serverId, that.serverId); } @Override diff --git a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/EurekaInstanceRegisteredEvent.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/EurekaInstanceRegisteredEvent.java index fc36ae356..2021e44a5 100644 --- a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/EurekaInstanceRegisteredEvent.java +++ b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/EurekaInstanceRegisteredEvent.java @@ -76,8 +76,9 @@ public class EurekaInstanceRegisteredEvent extends ApplicationEvent { return false; } EurekaInstanceRegisteredEvent that = (EurekaInstanceRegisteredEvent) o; - return Objects.equals(instanceInfo, that.instanceInfo) - && leaseDuration == leaseDuration && replication == replication; + return this.leaseDuration == that.leaseDuration + && this.replication == that.replication + && Objects.equals(this.instanceInfo, that.instanceInfo); } @Override