Return-Path: Delivered-To: apmail-openjpa-commits-archive@www.apache.org Received: (qmail 59663 invoked from network); 5 Apr 2009 22:37:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 5 Apr 2009 22:37:46 -0000 Received: (qmail 6760 invoked by uid 500); 5 Apr 2009 22:37:45 -0000 Delivered-To: apmail-openjpa-commits-archive@openjpa.apache.org Received: (qmail 6729 invoked by uid 500); 5 Apr 2009 22:37:45 -0000 Mailing-List: contact commits-help@openjpa.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openjpa.apache.org Delivered-To: mailing list commits@openjpa.apache.org Received: (qmail 6720 invoked by uid 99); 5 Apr 2009 22:37:45 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 05 Apr 2009 22:37:45 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Sun, 05 Apr 2009 22:37:45 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D85D423888E7; Sun, 5 Apr 2009 22:37:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r762177 - /openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java Date: Sun, 05 Apr 2009 22:37:24 -0000 To: commits@openjpa.apache.org From: allee8285@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090405223724.D85D423888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: allee8285 Date: Sun Apr 5 22:37:24 2009 New Revision: 762177 URL: http://svn.apache.org/viewvc?rev=762177&view=rev Log: OPENJPA-957 - Guard NPE as fetch may be null in getForUpdateClause. Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java?rev=762177&r1=762176&r2=762177&view=diff ============================================================================== --- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java (original) +++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java Sun Apr 5 22:37:24 2009 @@ -350,7 +350,8 @@ else isolationLevel = conf.getTransactionIsolationConstant(); - if (fetch.getReadLockLevel() >= MixedLockLevels.LOCK_PESSIMISTIC_WRITE) + if (fetch != null + && fetch.getReadLockLevel() >= MixedLockLevels.LOCK_PESSIMISTIC_WRITE) isolationLevel = Connection.TRANSACTION_SERIALIZABLE; if (isForUpdate) {