SpringCloud/spring-cloud-netflix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.2.x'

Browse Source
This commit is contained in:
spencergibb
2020-11-02 12:59:11 -05:00
parent 99ebcfb79a ce82ea3b71
commit 839a780e54
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/EurekaInstanceCanceledEvent.java
View File

@@ -73,8 +73,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

5
spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/EurekaInstanceRegisteredEvent.java
View File

@@ -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