Skip to content

Commit 9b2c8f9

Browse files
authored
Merge branch 'master' into dev-springcloud-plugin
2 parents 59bd808 + 1b15819 commit 9b2c8f9

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

shenyu-sync-data-center/shenyu-sync-data-http/src/main/java/org/apache/shenyu/sync/data/http/config/HttpConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ public boolean equals(final Object o) {
205205
if (this == o) {
206206
return true;
207207
}
208-
if (o == null || getClass() != o.getClass()) {
208+
if (Objects.isNull(o) || getClass() != o.getClass()) {
209209
return false;
210210
}
211211
HttpConfig that = (HttpConfig) o;

shenyu-sync-data-center/shenyu-sync-data-nacos/src/main/java/org/apache/shenyu/sync/data/nacos/config/NacosACMConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ public boolean equals(final Object o) {
126126
if (this == o) {
127127
return true;
128128
}
129-
if (o == null || getClass() != o.getClass()) {
129+
if (Objects.isNull(o) || getClass() != o.getClass()) {
130130
return false;
131131
}
132132
NacosACMConfig that = (NacosACMConfig) o;

shenyu-sync-data-center/shenyu-sync-data-nacos/src/main/java/org/apache/shenyu/sync/data/nacos/config/NacosConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public boolean equals(final Object o) {
146146
if (this == o) {
147147
return true;
148148
}
149-
if (o == null || getClass() != o.getClass()) {
149+
if (Objects.isNull(o) || getClass() != o.getClass()) {
150150
return false;
151151
}
152152
NacosConfig that = (NacosConfig) o;

shenyu-sync-data-center/shenyu-sync-data-websocket/src/main/java/org/apache/shenyu/plugin/sync/data/websocket/config/WebsocketConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public boolean equals(final Object o) {
7272
if (this == o) {
7373
return true;
7474
}
75-
if (o == null || getClass() != o.getClass()) {
75+
if (Objects.isNull(o) || getClass() != o.getClass()) {
7676
return false;
7777
}
7878
WebsocketConfig that = (WebsocketConfig) o;

0 commit comments

Comments
 (0)