Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 87311 invoked from network); 18 Oct 2007 17:07:14 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 18 Oct 2007 17:07:14 -0000 Received: (qmail 50955 invoked by uid 500); 18 Oct 2007 17:07:02 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 50920 invoked by uid 500); 18 Oct 2007 17:07:02 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 50909 invoked by uid 99); 18 Oct 2007 17:07:02 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Oct 2007 10:07:02 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED 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; Thu, 18 Oct 2007 17:07:14 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C2CE51A9832; Thu, 18 Oct 2007 10:06:53 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r586035 - in /db/derby/code/branches/10.3/java: engine/org/apache/derby/iapi/types/Like.java testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java Date: Thu, 18 Oct 2007 17:06:52 -0000 To: derby-commits@db.apache.org From: mamta@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071018170653.C2CE51A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mamta Date: Thu Oct 18 10:06:43 2007 New Revision: 586035 URL: http://svn.apache.org/viewvc?rev=586035&view=rev Log: Merging javadoc fix from trunk(586033) into 10.3 codeline. Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/iapi/types/Like.java db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/iapi/types/Like.java URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/iapi/types/Like.java?rev=586035&r1=586034&r2=586035&view=diff ============================================================================== --- db/derby/code/branches/10.3/java/engine/org/apache/derby/iapi/types/Like.java (original) +++ db/derby/code/branches/10.3/java/engine/org/apache/derby/iapi/types/Like.java Thu Oct 18 10:06:43 2007 @@ -277,9 +277,11 @@ * @param pat pattern to look for in val. * @param pLoc character position in pat. * @param collator null if we are dealing with UCS_BASIC character string - * types. If not null, then we use it to get collation elements for - * character in val and pat to do the equality comparison. - * @return + * types. If not null, then we use it to get collation elements for + * character in val and pat to do the equality comparison. + * @return TRUE if the character in val and vLoc match based on straight + * equality or collation element based equality. Otherwise we will + * return FALSE. */ private static boolean checkEquality(char[] val, int vLoc, char[] pat, int pLoc, RuleBasedCollator collator) { Modified: db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java?rev=586035&r1=586034&r2=586035&view=diff ============================================================================== --- db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java (original) +++ db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java Thu Oct 18 10:06:43 2007 @@ -294,7 +294,10 @@ * based on equal and like. * * @param conn - * @param expectedMatchCount number of rows we expect back. 2 for french, 1 for English + * @param expectedMatchCountForEqual number of rows we expect back for =. + * 2 for French, 1 for English + * @param expectedMatchCountForLike number of rows we expect back for LIKE. + * 1 for French and English * @throws SQLException */ private void compareAgrave(Connection conn, int expectedMatchCountForEqual,