Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 73560 invoked from network); 22 Sep 2010 09:25:06 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 22 Sep 2010 09:25:06 -0000 Received: (qmail 37772 invoked by uid 500); 22 Sep 2010 09:25:06 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 37658 invoked by uid 500); 22 Sep 2010 09:25:03 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 37651 invoked by uid 99); 22 Sep 2010 09:25:03 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Sep 2010 09:25:03 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Sep 2010 09:25:01 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4FFEA2388A1C; Wed, 22 Sep 2010 09:24:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r999826 - in /harmony/enhanced/java/branches/java6: ./ classlib/ classlib/depends/libs/ classlib/modules/luni/src/main/java/org/apache/harmony/luni/util/FloatingPointParser.java drlvm/ jdktools/ Date: Wed, 22 Sep 2010 09:24:41 -0000 To: commits@harmony.apache.org From: hindessm@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100922092441.4FFEA2388A1C@eris.apache.org> Author: hindessm Date: Wed Sep 22 09:24:40 2010 New Revision: 999826 URL: http://svn.apache.org/viewvc?rev=999826&view=rev Log: Merge change from /harmony/enhanced/java/trunk@999724: r999724 | tellison | 2010-09-22 02:57:57 +0100 (Wed, 22 Sep 2010) | 2 lines Apply patch for HARMONY-6635 (FloatingPointParser uses toLowerCase unnecessarily) Modified: harmony/enhanced/java/branches/java6/ (props changed) harmony/enhanced/java/branches/java6/classlib/ (props changed) harmony/enhanced/java/branches/java6/classlib/depends/libs/ (props changed) harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/util/FloatingPointParser.java harmony/enhanced/java/branches/java6/drlvm/ (props changed) harmony/enhanced/java/branches/java6/jdktools/ (props changed) Propchange: harmony/enhanced/java/branches/java6/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Sep 22 09:24:40 2010 @@ -1,4 +1,4 @@ /harmony/enhanced/java/branches/mrh:935751-941490 -/harmony/enhanced/java/trunk:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716 +/harmony/enhanced/java/trunk:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724 /harmony/enhanced/trunk:476395-929252 /incubator/harmony/enhanced/trunk:292550-476394 Propchange: harmony/enhanced/java/branches/java6/classlib/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Sep 22 09:24:40 2010 @@ -1,7 +1,7 @@ /harmony/enhanced/classlib/trunk:713674-735919,765923-926091,926318-926838 /harmony/enhanced/classlib/trunk/working_classlib:884014-884286 /harmony/enhanced/java/branches/mrh/classlib:935751-941490 -/harmony/enhanced/java/trunk/classlib:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716 +/harmony/enhanced/java/trunk/classlib:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724 /harmony/enhanced/trunk/classlib:476395-929252 /harmony/enhanced/trunk/working_classlib:476396-920147 /incubator/harmony/enhanced/trunk/classlib:292550-476394 Propchange: harmony/enhanced/java/branches/java6/classlib/depends/libs/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Sep 22 09:24:40 2010 @@ -1,4 +1,4 @@ /harmony/enhanced/classlib/trunk/depends/libs:544451-926091 -/harmony/enhanced/java/trunk/classlib/depends/libs:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716 +/harmony/enhanced/java/trunk/classlib/depends/libs:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724 /harmony/enhanced/trunk/classlib/depends/libs:476395-929252 /incubator/harmony/enhanced/trunk/classlib/depends/libs:292550-476394 Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/util/FloatingPointParser.java URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/util/FloatingPointParser.java?rev=999826&r1=999825&r2=999826&view=diff ============================================================================== --- harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/util/FloatingPointParser.java (original) +++ harmony/enhanced/java/branches/java6/classlib/modules/luni/src/main/java/org/apache/harmony/luni/util/FloatingPointParser.java Wed Sep 22 09:24:40 2010 @@ -280,6 +280,28 @@ public final class FloatingPointParser { throw new NumberFormatException(); } + /* + * Answers true if the string should be parsed as a hex encoding. + * Assumes the string is trimmed. + */ + private static boolean parseAsHex(String s) { + int length = s.length(); + if (length < 2) { + return false; + } + char first = s.charAt(0); + char second = s.charAt(1); + if (first == '+' || first == '-') { + // Move along + if (length < 3) { + return false; + } + first = second; + second = s.charAt(2); + } + return (first == '0') && (second == 'x' || second == 'X'); + } + /** * Returns the closest double value to the real number in the string. * @@ -305,7 +327,7 @@ public final class FloatingPointParser { } // See if it could be a hexadecimal representation - if (s.toLowerCase().indexOf("0x") != -1) { //$NON-NLS-1$ + if (parseAsHex(s)) { return HexStringParser.parseDouble(s); } @@ -354,7 +376,7 @@ public final class FloatingPointParser { } // See if it could be a hexadecimal representation - if (s.toLowerCase().indexOf("0x") != -1) { //$NON-NLS-1$ + if (parseAsHex(s)) { return HexStringParser.parseFloat(s); } Propchange: harmony/enhanced/java/branches/java6/drlvm/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Sep 22 09:24:40 2010 @@ -1,5 +1,5 @@ /harmony/enhanced/java/branches/mrh/drlvm:935751-941490 -/harmony/enhanced/java/trunk/drlvm:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716 +/harmony/enhanced/java/trunk/drlvm:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724 /harmony/enhanced/trunk/drlvm:476395-929252 /harmony/enhanced/trunk/working_vm:476396-920147 /incubator/harmony/enhanced/trunk/drlvm:292550-476394 Propchange: harmony/enhanced/java/branches/java6/jdktools/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Sep 22 09:24:40 2010 @@ -1,4 +1,4 @@ -/harmony/enhanced/java/trunk/jdktools:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716 +/harmony/enhanced/java/trunk/jdktools:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724 /harmony/enhanced/jdktools/trunk:630107-925933 /harmony/enhanced/trunk/jdktools:476395-929252 /harmony/enhanced/trunk/working_jdktools:476396-920147