Return-Path: Delivered-To: apmail-openjpa-commits-archive@www.apache.org Received: (qmail 99335 invoked from network); 12 Jun 2008 00:00:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 12 Jun 2008 00:00:05 -0000 Received: (qmail 54558 invoked by uid 500); 12 Jun 2008 00:00:07 -0000 Delivered-To: apmail-openjpa-commits-archive@openjpa.apache.org Received: (qmail 54547 invoked by uid 500); 12 Jun 2008 00:00:07 -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 54538 invoked by uid 99); 12 Jun 2008 00:00:07 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Jun 2008 17:00:07 -0700 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; Wed, 11 Jun 2008 23:59:26 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 70D5423889FE; Wed, 11 Jun 2008 16:59:44 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r666920 - /openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/Exceptions.java Date: Wed, 11 Jun 2008 23:59:44 -0000 To: commits@openjpa.apache.org From: pcl@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080611235944.70D5423889FE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pcl Date: Wed Jun 11 16:59:44 2008 New Revision: 666920 URL: http://svn.apache.org/viewvc?rev=666920&view=rev Log: Merge from ../branches/1.1.x. svn merge -c 657148 ../branches/1.1.x Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/Exceptions.java Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/Exceptions.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/Exceptions.java?rev=666920&r1=666919&r2=666920&view=diff ============================================================================== --- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/Exceptions.java (original) +++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/Exceptions.java Wed Jun 11 16:59:44 2008 @@ -171,7 +171,9 @@ if (i < nested.length) { out.println("NestedThrowables:"); for (; i < nested.length; i++) - nested[i].printStackTrace(out); + // guard against a nasty null in the array + if (nested[i] != null) + nested[i].printStackTrace(out); } } @@ -188,7 +190,9 @@ if (i < nested.length) { out.println("NestedThrowables:"); for (; i < nested.length; i++) - nested[i].printStackTrace(out); + // guard against a nasty null in the array + if (nested[i] != null) + nested[i].printStackTrace(out); } } @@ -239,7 +243,10 @@ if (isSerializable(nested[i])) newNested[i] = nested[i]; else - newNested[i] = new Exception(nested[i].toString()); + // guard against a nasty null in the array by using valueOf + // instead of toString to prevent throwing yet another + // exception + newNested[i] = new Exception(String.valueOf(nested[i])); } return newNested; }