Skip to content

Commit 56e5a13

Browse files
committed
HHH-19750 Consider value-bind criteria parameters as instance-unique
1 parent bc77876 commit 56e5a13

File tree

1 file changed

+3
-20
lines changed

1 file changed

+3
-20
lines changed

hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/ValueBindJpaCriteriaParameter.java

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import org.hibernate.query.sqm.tree.SqmCopyContext;
1111
import org.hibernate.query.sqm.tree.SqmRenderContext;
1212

13-
import java.util.Objects;
1413

1514

1615
/**
@@ -55,33 +54,17 @@ public void appendHqlString(StringBuilder hql, SqmRenderContext context) {
5554
}
5655

5756
@Override
58-
// TODO: fix this
5957
public int compareTo(SqmParameter<T> parameter) {
60-
return this == parameter ? 0 : 1;
58+
return Integer.compare( hashCode(), parameter.hashCode() );
6159
}
6260

63-
// this is not really a parameter, it's really a literal value
64-
// so use value equality based on its value
65-
6661
@Override
6762
public boolean equals(Object object) {
68-
return object instanceof ValueBindJpaCriteriaParameter<?> that
69-
&& Objects.equals( this.value, that.value );
70-
// && getJavaTypeDescriptor().areEqual( this.value, (T) that.value );
63+
return this == object;
7164
}
7265

7366
@Override
7467
public int hashCode() {
75-
return value == null ? 0 : value.hashCode(); // getJavaTypeDescriptor().extractHashCode( value );
68+
return super.hashCode();
7669
}
77-
78-
// @Override
79-
// public boolean equals(Object object) {
80-
// return this == object;
81-
// }
82-
//
83-
// @Override
84-
// public int hashCode() {
85-
// return System.identityHashCode( this );
86-
// }
8770
}

0 commit comments

Comments
 (0)