Skip to content

Commit fcee67a

Browse files
committed
fix: asymmetrical check of uid
1 parent 984ff54 commit fcee67a

File tree

1 file changed

+4
-3
lines changed
  • kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model

1 file changed

+4
-3
lines changed

kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/HasMetadata.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -584,10 +584,11 @@ default boolean isSameResource(HasMetadata other, boolean strict) {
584584
return false;
585585
}
586586

587-
// check UID first
587+
// check UID first, if either is not null, if both are null, look at other fields
588588
final var uid = metadata.getUid();
589-
if (uid != null) {
590-
return uid.equals(otherMetadata.getUid());
589+
final var otherUID = otherMetadata.getUid();
590+
if (uid != null || otherUID != null) {
591+
return Objects.equals(uid, otherUID);
591592
}
592593

593594
final var kind = getKind();

0 commit comments

Comments
 (0)