Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish

Browse Source 
Closes gh-1581
This commit is contained in:
Brian Clozel
2021-11-25 19:09:23 +01:00
parent d178eafc11
commit fab9abd7fe
7 changed files with 220 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-expression/src/main/java/org/springframework/expression/spel/ast/Operator.java
View File

@@ -24,7 +24,6 @@ import org.springframework.asm.MethodVisitor;
import org.springframework.expression.EvaluationContext;
import org.springframework.expression.spel.CodeFlow;
import org.springframework.lang.Nullable;
import org.springframework.util.ClassUtils;
import org.springframework.util.NumberUtils;
import org.springframework.util.ObjectUtils;

2
spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeComparator.java
View File

@@ -46,7 +46,7 @@ public class StandardTypeComparator implements TypeComparator {
return true;
}
if (left instanceof Comparable && right instanceof Comparable) {
Class<?> ancestor = ClassUtils.determineCommonAncestor(left.getClass(), right.getClass());
Class<?> ancestor = ClassUtils.determineCommonAncestor(left.getClass(), right.getClass());
return ancestor != null && Comparable.class.isAssignableFrom(ancestor);
}
return false;