From b9fd5d4e2578d992e63a2b2959d1f016c2d2873d Mon Sep 17 00:00:00 2001 From: remm Date: Mon, 25 Sep 2006 10:42:27 +0000 Subject: [PATCH] - Support equals for strings. - Submitted by Stan Silvert. git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@449639 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/el/lang/ELSupport.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/java/org/apache/el/lang/ELSupport.java b/java/org/apache/el/lang/ELSupport.java index 3dda6d180..9ec8e6d41 100644 --- a/java/org/apache/el/lang/ELSupport.java +++ b/java/org/apache/el/lang/ELSupport.java @@ -111,6 +111,9 @@ public class ELSupport { return obj0.equals(coerceToEnum(obj1, obj0.getClass())); } else if (obj1.getClass().isEnum()) { return obj1.equals(coerceToEnum(obj0, obj1.getClass())); + } else if (obj0 instanceof String || obj1 instanceof String) { + int lexCompare = coerceToString(obj0).compareTo(coerceToString(obj1)); + return (lexCompare == 0) ? true : false; } if (isBigDecimalOp(obj0, obj1)) { BigDecimal bd0 = (BigDecimal) coerceToNumber(obj0, BigDecimal.class); -- 2.11.0