Return-Path: Delivered-To: apmail-jakarta-taglibs-dev-archive@www.apache.org Received: (qmail 69806 invoked from network); 29 Nov 2006 18:33:18 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 29 Nov 2006 18:33:18 -0000 Received: (qmail 61149 invoked by uid 500); 29 Nov 2006 18:33:26 -0000 Delivered-To: apmail-jakarta-taglibs-dev-archive@jakarta.apache.org Received: (qmail 61131 invoked by uid 500); 29 Nov 2006 18:33:26 -0000 Mailing-List: contact taglibs-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Tag Libraries Developers List" Reply-To: "Tag Libraries Developers List" Delivered-To: mailing list taglibs-dev@jakarta.apache.org Received: (qmail 61119 invoked by uid 500); 29 Nov 2006 18:33:26 -0000 Received: (qmail 61116 invoked by uid 99); 29 Nov 2006 18:33:26 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Nov 2006 10:33:26 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Nov 2006 10:33:16 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id DC6EB1A984D; Wed, 29 Nov 2006 10:32:38 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r480670 - /jakarta/taglibs/proper/standard/trunk/src/org/apache/taglibs/standard/functions/Functions.java Date: Wed, 29 Nov 2006 18:32:38 -0000 To: taglibs-cvs@jakarta.apache.org From: bayard@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061129183238.DC6EB1A984D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bayard Date: Wed Nov 29 10:32:38 2006 New Revision: 480670 URL: http://svn.apache.org/viewvc?view=rev&rev=480670 Log: Applying the fix from Jochen Metzinger in #39284 - the existing code was already fixed, but this seems like a worthwhile simplification Modified: jakarta/taglibs/proper/standard/trunk/src/org/apache/taglibs/standard/functions/Functions.java Modified: jakarta/taglibs/proper/standard/trunk/src/org/apache/taglibs/standard/functions/Functions.java URL: http://svn.apache.org/viewvc/jakarta/taglibs/proper/standard/trunk/src/org/apache/taglibs/standard/functions/Functions.java?view=diff&rev=480670&r1=480669&r2=480670 ============================================================================== --- jakarta/taglibs/proper/standard/trunk/src/org/apache/taglibs/standard/functions/Functions.java (original) +++ jakarta/taglibs/proper/standard/trunk/src/org/apache/taglibs/standard/functions/Functions.java Wed Nov 29 10:32:38 2006 @@ -83,10 +83,7 @@ public static boolean endsWith(String input, String substring) { if (input == null) input = ""; if (substring == null) substring = ""; - int index = input.lastIndexOf(substring); - if (index == -1) return false; - if (index == 0 && substring.length() == 0) return true; - return (index == input.length() - substring.length()); + return input.endsWith(substring); } public static String substring(String input, int beginIndex, int endIndex) { --------------------------------------------------------------------- To unsubscribe, e-mail: taglibs-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: taglibs-dev-help@jakarta.apache.org