Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 92933 invoked from network); 9 Feb 2011 07:36:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 9 Feb 2011 07:36:29 -0000 Received: (qmail 98649 invoked by uid 500); 9 Feb 2011 07:36:29 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 98574 invoked by uid 500); 9 Feb 2011 07:36:26 -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 98557 invoked by uid 99); 9 Feb 2011 07:36:25 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Feb 2011 07:36:25 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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, 09 Feb 2011 07:36:23 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8A86C23889B3; Wed, 9 Feb 2011 07:36:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1068772 - /db/derby/code/trunk/java/client/org/apache/derby/client/am/ResultSet.java Date: Wed, 09 Feb 2011 07:36:02 -0000 To: derby-commits@db.apache.org From: kahatlen@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110209073602.8A86C23889B3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kahatlen Date: Wed Feb 9 07:36:02 2011 New Revision: 1068772 URL: http://svn.apache.org/viewvc?rev=1068772&view=rev Log: DERBY-5012: bad allocation guard in ResultSet#resetUpdatedColumnsForInsert Reworked fix based on patch contributed by Dave Brosius . Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/ResultSet.java Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/ResultSet.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/ResultSet.java?rev=1068772&r1=1068771&r2=1068772&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/am/ResultSet.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/am/ResultSet.java Wed Feb 9 07:36:02 2011 @@ -4694,16 +4694,8 @@ public abstract class ResultSet implemen private final void resetUpdatedColumnsForInsert() { // initialize updateColumns with nulls for all columns - if (updatedColumns_ == null) { - updatedColumns_ = new Object[resultSetMetaData_.columns_]; - } - if (columnUpdated_ != null) { - columnUpdated_ = new boolean[resultSetMetaData_.columns_]; - } - for (int i = 0; i < updatedColumns_.length; i++) { + for (int i = 0; i < resultSetMetaData_.columns_; i++) { updateColumn(i+1, null); - } - for (int i = 0; i < columnUpdated_.length; i++) { columnUpdated_[i] = false; } }