Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 72767 invoked from network); 3 Aug 2007 10:32:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 3 Aug 2007 10:32:31 -0000 Received: (qmail 22219 invoked by uid 500); 3 Aug 2007 10:32:31 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 22190 invoked by uid 500); 3 Aug 2007 10:32:31 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 22181 invoked by uid 99); 3 Aug 2007 10:32:30 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Aug 2007 03:32:30 -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; Fri, 03 Aug 2007 10:32:11 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5DC2E1A981A; Fri, 3 Aug 2007 03:32:08 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r562403 - /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/BufferedStringValue.java Date: Fri, 03 Aug 2007 10:32:07 -0000 To: commits@jackrabbit.apache.org From: stefan@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070803103208.5DC2E1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: stefan Date: Fri Aug 3 03:32:05 2007 New Revision: 562403 URL: http://svn.apache.org/viewvc?view=rev&rev=562403 Log: JCR-1038: java.lang.ArrayIndexOutOfBoundsException while importXML in Java 6 Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/BufferedStringValue.java Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/BufferedStringValue.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/BufferedStringValue.java?view=diff&rev=562403&r1=562402&r2=562403 ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/BufferedStringValue.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/BufferedStringValue.java Fri Aug 3 03:32:05 2007 @@ -194,7 +194,9 @@ } else { if (bufferPos + length > buffer.length) { // reallocate new buffer and spool old buffer contents - char[] newBuffer = new char[buffer.length + BUFFER_INCREMENT]; + int bufferSize = + BUFFER_INCREMENT * (((bufferPos + length) / BUFFER_INCREMENT) + 1); + char[] newBuffer = new char[bufferSize]; System.arraycopy(buffer, 0, newBuffer, 0, bufferPos); buffer = newBuffer; }