From 4fdf171f7d2ab9974cd2e5cf3420915a4b975bf7 Mon Sep 17 00:00:00 2001
From: BraveLeeLee <705059237@qq.com>
Date: Wed, 10 Jun 2020 15:03:21 +0800
Subject: [PATCH] DATAMONGO-2565 - Evaluate correct expression when obtaining
 collation from MongoPersistentEntity.

Original pull request: #869.
---
 .../data/mongodb/core/mapping/BasicMongoPersistentEntity.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentEntity.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentEntity.java
index e0a1c4d39..74a2d0802 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentEntity.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentEntity.java
@@ -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) {