Return-Path: X-Original-To: apmail-openjpa-commits-archive@www.apache.org Delivered-To: apmail-openjpa-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6A430E311 for ; Thu, 10 Jan 2013 23:17:20 +0000 (UTC) Received: (qmail 64063 invoked by uid 500); 10 Jan 2013 23:17:18 -0000 Delivered-To: apmail-openjpa-commits-archive@openjpa.apache.org Received: (qmail 64008 invoked by uid 500); 10 Jan 2013 23:17:18 -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 63948 invoked by uid 99); 10 Jan 2013 23:17:17 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Jan 2013 23:17:17 +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; Thu, 10 Jan 2013 23:17:15 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 97D582388A56; Thu, 10 Jan 2013 23:16:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1431723 - /openjpa/branches/2.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java Date: Thu, 10 Jan 2013 23:16:55 -0000 To: commits@openjpa.apache.org From: hthomann@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130110231655.97D582388A56@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hthomann Date: Thu Jan 10 23:16:55 2013 New Revision: 1431723 URL: http://svn.apache.org/viewvc?rev=1431723&view=rev Log: OPENJPA-2236: Put try/catch around connection info trace in DBDictionary - back ported Jeremy Bauer's trunk changes to 2.0.x. Modified: openjpa/branches/2.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java Modified: openjpa/branches/2.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java?rev=1431723&r1=1431722&r2=1431723&view=diff ============================================================================== --- openjpa/branches/2.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java (original) +++ openjpa/branches/2.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java Thu Jan 10 23:16:55 2013 @@ -445,10 +445,15 @@ public class DBDictionary if (log.isTraceEnabled()) { log.trace(DBDictionaryFactory.toString(metaData)); - if (isJDBC3) - log.trace(_loc.get("connection-defaults", new Object[]{ - conn.getAutoCommit(), conn.getHoldability(), - conn.getTransactionIsolation()})); + if (isJDBC3) { + try { + log.trace(_loc.get("connection-defaults", new Object[]{ + conn.getAutoCommit(), conn.getHoldability(), + conn.getTransactionIsolation()})); + } catch (Throwable t) { + log.trace("Unable to trace connection settings", t); + } + } } // Configure the naming utility