Return-Path: Delivered-To: apmail-jakarta-commons-dev-archive@www.apache.org Received: (qmail 84421 invoked from network); 21 Aug 2004 10:01:28 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 21 Aug 2004 10:01:28 -0000 Received: (qmail 25894 invoked by uid 500); 21 Aug 2004 10:01:25 -0000 Delivered-To: apmail-jakarta-commons-dev-archive@jakarta.apache.org Received: (qmail 25830 invoked by uid 500); 21 Aug 2004 10:01:24 -0000 Mailing-List: contact commons-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Jakarta Commons Developers List" Reply-To: "Jakarta Commons Developers List" Delivered-To: mailing list commons-dev@jakarta.apache.org Received: (qmail 25817 invoked by uid 500); 21 Aug 2004 10:01:24 -0000 Received: (qmail 25811 invoked by uid 99); 21 Aug 2004 10:01:24 -0000 X-ASF-Spam-Status: No, hits=-2.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.27.1) with SMTP; Sat, 21 Aug 2004 03:01:19 -0700 Received: (qmail 84396 invoked by uid 1431); 21 Aug 2004 10:01:19 -0000 Date: 21 Aug 2004 10:01:19 -0000 Message-ID: <20040821100119.84395.qmail@minotaur.apache.org> From: dion@apache.org To: jakarta-commons-cvs@apache.org Subject: cvs commit: jakarta-commons/jexl/src/java/org/apache/commons/jexl/parser ASTNENode.java ASTEQNode.java X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N dion 2004/08/21 03:01:19 Modified: jexl/src/java/org/apache/commons/jexl/parser ASTNENode.java ASTEQNode.java Log: Back out jdk1.4 only change Revision Changes Path 1.6 +7 -7 jakarta-commons/jexl/src/java/org/apache/commons/jexl/parser/ASTNENode.java Index: ASTNENode.java =================================================================== RCS file: /home/cvs/jakarta-commons/jexl/src/java/org/apache/commons/jexl/parser/ASTNENode.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ASTNENode.java 20 Aug 2004 12:04:39 -0000 1.5 +++ ASTNENode.java 21 Aug 2004 10:01:18 -0000 1.6 @@ -66,30 +66,30 @@ } else if (left.getClass().equals(right.getClass())) { - return Boolean.valueOf(!left.equals(right)); + return new Boolean(!left.equals(right)); } else if(left instanceof Float || left instanceof Double || right instanceof Float || right instanceof Double) { - return Boolean.valueOf( + return new Boolean( !Coercion.coerceDouble(left).equals(Coercion.coerceDouble(right))); } else if ( left instanceof Number || right instanceof Number || left instanceof Character || right instanceof Character) { - return Boolean.valueOf( + return new Boolean( !Coercion.coerceLong(left).equals(Coercion.coerceLong(right))); } else if (left instanceof Boolean || right instanceof Boolean) { - return Boolean.valueOf( + return new Boolean( !Coercion.coerceBoolean(left).equals(Coercion.coerceBoolean(right))); } else if (left instanceof java.lang.String || right instanceof String) { - return Boolean.valueOf(!left.toString().equals(right.toString())); + return new Boolean(!left.toString().equals(right.toString())); } - return Boolean.valueOf(!left.equals(right)); + return new Boolean(!left.equals(right)); } } 1.6 +7 -7 jakarta-commons/jexl/src/java/org/apache/commons/jexl/parser/ASTEQNode.java Index: ASTEQNode.java =================================================================== RCS file: /home/cvs/jakarta-commons/jexl/src/java/org/apache/commons/jexl/parser/ASTEQNode.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ASTEQNode.java 20 Aug 2004 12:04:39 -0000 1.5 +++ ASTEQNode.java 21 Aug 2004 10:01:18 -0000 1.6 @@ -64,7 +64,7 @@ } else if (left.getClass().equals(right.getClass())) { - return Boolean.valueOf(left.equals(right)); + return new Boolean(left.equals(right)); } else if(left instanceof Float || left instanceof Double || right instanceof Float || right instanceof Double) @@ -72,24 +72,24 @@ Double l = Coercion.coerceDouble(left); Double r = Coercion.coerceDouble(right); - return Boolean.valueOf(l.equals(r)); + return new Boolean(l.equals(r)); } else if ( left instanceof Number || right instanceof Number || left instanceof Character || right instanceof Character) { - return Boolean.valueOf( + return new Boolean( Coercion.coerceLong(left).equals(Coercion.coerceLong(right))); } else if (left instanceof Boolean || right instanceof Boolean) { - return Boolean.valueOf( + return new Boolean( Coercion.coerceBoolean(left).equals(Coercion.coerceBoolean(right))); } else if (left instanceof java.lang.String || right instanceof String) { - return Boolean.valueOf(left.toString().equals(right.toString())); + return new Boolean(left.toString().equals(right.toString())); } - return Boolean.valueOf(left.equals(right)); + return new Boolean(left.equals(right)); } } --------------------------------------------------------------------- To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: commons-dev-help@jakarta.apache.org