Return-Path: Delivered-To: apmail-db-jdo-commits-archive@www.apache.org Received: (qmail 38755 invoked from network); 3 Dec 2007 14:12:53 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 3 Dec 2007 14:12:53 -0000 Received: (qmail 37054 invoked by uid 500); 3 Dec 2007 14:12:41 -0000 Mailing-List: contact jdo-commits-help@db.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: jdo-dev@db.apache.org Delivered-To: mailing list jdo-commits@db.apache.org Received: (qmail 37043 invoked by uid 99); 3 Dec 2007 14:12:41 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Dec 2007 06:12:41 -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; Mon, 03 Dec 2007 14:12:29 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B7C721A9832; Mon, 3 Dec 2007 06:12:31 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r600542 - in /db/jdo/trunk: api2-legacy/src/java/javax/jdo/JDOHelper.java api2/src/java/javax/jdo/JDOHelper.java Date: Mon, 03 Dec 2007 14:12:29 -0000 To: jdo-commits@db.apache.org From: andyj@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071203141231.B7C721A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: andyj Date: Mon Dec 3 06:12:27 2007 New Revision: 600542 URL: http://svn.apache.org/viewvc?rev=600542&view=rev Log: JDO-545 Comment out line that causes NPE putting a null value into a Hashtable. Modified: db/jdo/trunk/api2-legacy/src/java/javax/jdo/JDOHelper.java db/jdo/trunk/api2/src/java/javax/jdo/JDOHelper.java Modified: db/jdo/trunk/api2-legacy/src/java/javax/jdo/JDOHelper.java URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2-legacy/src/java/javax/jdo/JDOHelper.java?rev=600542&r1=600541&r2=600542&view=diff ============================================================================== --- db/jdo/trunk/api2-legacy/src/java/javax/jdo/JDOHelper.java (original) +++ db/jdo/trunk/api2-legacy/src/java/javax/jdo/JDOHelper.java Mon Dec 3 06:12:27 2007 @@ -946,7 +946,7 @@ // the PMF was configured by the given resource name // and not via named PMF for proper deserialization props.put(PROPERTY_SPI_RESOURCE_NAME, name); - props.put(PROPERTY_NAME, null); +// props.put(PROPERTY_NAME, null); } } catch (IOException ioe) { Modified: db/jdo/trunk/api2/src/java/javax/jdo/JDOHelper.java URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/JDOHelper.java?rev=600542&r1=600541&r2=600542&view=diff ============================================================================== --- db/jdo/trunk/api2/src/java/javax/jdo/JDOHelper.java (original) +++ db/jdo/trunk/api2/src/java/javax/jdo/JDOHelper.java Mon Dec 3 06:12:27 2007 @@ -1021,7 +1021,7 @@ // the PMF was configured by the given resource name // and not via named PMF for proper deserialization props.put(PROPERTY_SPI_RESOURCE_NAME, name); - props.put(PROPERTY_NAME, null); +// props.put(PROPERTY_NAME, null); } } catch (IOException ioe) {