Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 37305 invoked from network); 14 Jun 2007 16:35:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 14 Jun 2007 16:35:38 -0000 Received: (qmail 17527 invoked by uid 500); 14 Jun 2007 16:35:42 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 17505 invoked by uid 500); 14 Jun 2007 16:35:42 -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 17494 invoked by uid 99); 14 Jun 2007 16:35:42 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Jun 2007 09:35:42 -0700 X-ASF-Spam-Status: No, hits=-99.5 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; Thu, 14 Jun 2007 09:35:38 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id D489F1A981C; Thu, 14 Jun 2007 09:35:17 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r547299 - in /harmony/enhanced/classlib/trunk/modules/luni/src: main/java/java/util/BitSet.java test/java/tests/api/java/util/BitSetTest.java Date: Thu, 14 Jun 2007 16:35:17 -0000 To: commits@harmony.apache.org From: tellison@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070614163517.D489F1A981C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tellison Date: Thu Jun 14 09:35:16 2007 New Revision: 547299 URL: http://svn.apache.org/viewvc?view=rev&rev=547299 Log: Apply patch HARMONY-4147 ([classlib][luni] java.util.BitSet(Integer.MAX_VALUE) throws unexpected NegativeArraySizeException) Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/BitSet.java harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/BitSetTest.java Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/BitSet.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/BitSet.java?view=diff&rev=547299&r1=547298&r2=547299 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/BitSet.java (original) +++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/util/BitSet.java Thu Jun 14 09:35:16 2007 @@ -100,7 +100,7 @@ if (nbits < 0) { throw new NegativeArraySizeException(); } - bits = new long[(nbits + ELM_SIZE - 1) >> OFFSET]; + bits = new long[(nbits >> OFFSET) + ((nbits & RIGHT_BITS) > 0 ? 1 : 0)]; actualArrayLength = 0; isLengthActual = true; } Modified: harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/BitSetTest.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/BitSetTest.java?view=diff&rev=547299&r1=547298&r2=547299 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/BitSetTest.java (original) +++ harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/BitSetTest.java Thu Jun 14 09:35:16 2007 @@ -62,6 +62,9 @@ } catch (NegativeArraySizeException e) { // Correct behaviour } + + // Regression test for HARMONY-4147 + new BitSet(Integer.MAX_VALUE); } /**