mindol1004/spring-data-mongodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DATAMONGO-2565 - Evaluate correct expression when obtaining collation from MongoPersistentEntity.

Browse Source 
Original pull request: #869.
This commit is contained in:
BraveLeeLee
2020-06-10 15:03:21 +08:00
committed by Mark Paluch
parent 76990f4915
commit 4fdf171f7d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentEntity.java
View File

@@ -164,7 +164,7 @@ public class BasicMongoPersistentEntity<T> extends BasicPersistentEntity<T, Mong
@Override
public org.springframework.data.mongodb.core.query.Collation getCollation() {
Object collationValue = collationExpression != null ? expression.getValue(getEvaluationContext(null), String.class)
Object collationValue = collationExpression != null ? collationExpression.getValue(getEvaluationContext(null), String.class)
: this.collation;
if (collationValue == null) {