mirror of
https://github.com/ebean-orm/ebean.git
synced 2026-11-22 15:10:02 +00:00
Fix: CompareTo when discriminatorString is null
- Fix for regression introduced by #2646 in version 13.3.1 - Replaces PR #2664
This commit is contained in:
1 parent
4ba23ebc22
commit
5b9ca2933f
2 files changed
+24
-7
No files matched your search
+3
-7
@@ -259,15 +259,11 @@ public final class DeployInheritInfo implements Comparable<DeployInheritInfo> {
|
||||
}
|
||||
|
||||
@Override
|
||||
public int compareTo(DeployInheritInfo o) {
|
||||
if (o == this || o.discriminatorStringValue == null && discriminatorStringValue == null) {
|
||||
public int compareTo(DeployInheritInfo other) {
|
||||
if (other == this) {
|
||||
return 0;
|
||||
} else if (o.discriminatorStringValue == null) {
|
||||
return 1;
|
||||
} else if (discriminatorStringValue == null) {
|
||||
return -1;
|
||||
} else {
|
||||
return discriminatorStringValue.compareTo(o.discriminatorStringValue);
|
||||
return type.getName().compareTo(other.type.getName());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user