Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 96903 invoked from network); 20 Nov 2007 22:28:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 20 Nov 2007 22:28:38 -0000 Received: (qmail 45428 invoked by uid 500); 20 Nov 2007 22:28:25 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 45398 invoked by uid 500); 20 Nov 2007 22:28:25 -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 45387 invoked by uid 99); 20 Nov 2007 22:28:25 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Nov 2007 14:28:25 -0800 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; Tue, 20 Nov 2007 22:28:23 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4B6B11A9832; Tue, 20 Nov 2007 14:28:16 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r596853 - /db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CachedPage.java Date: Tue, 20 Nov 2007 22:28:16 -0000 To: derby-commits@db.apache.org From: dag@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071120222816.4B6B11A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dag Date: Tue Nov 20 14:28:15 2007 New Revision: 596853 URL: http://svn.apache.org/viewvc?rev=596853&view=rev Log: DERBY-3215 Potential NullPointerException in CachedPage class Patch DERBY-3215.diff. Fixes two erroneous usages of StandardException.newException(SQLState.FILE_WRITE_PAGE_EXCEPTION,..) Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CachedPage.java Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CachedPage.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CachedPage.java?rev=596853&r1=596852&r2=596853&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CachedPage.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CachedPage.java Tue Nov 20 14:28:15 2007 @@ -816,7 +816,7 @@ // page cannot be written throw StandardException.newException( SQLState.FILE_WRITE_PAGE_EXCEPTION, - ioe, identity, new Integer(myContainer.getPageSize())); + ioe, identity); } finally { @@ -833,7 +833,7 @@ throw dataFactory.markCorrupt( StandardException.newException( SQLState.FILE_WRITE_PAGE_EXCEPTION, nested, - identity, new Integer(myContainer.getPageSize()))); + identity)); } synchronized (this)