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 1A3C9D34C for ; Wed, 7 Nov 2012 15:14:33 +0000 (UTC) Received: (qmail 92250 invoked by uid 500); 7 Nov 2012 15:14:33 -0000 Delivered-To: apmail-openjpa-commits-archive@openjpa.apache.org Received: (qmail 92050 invoked by uid 500); 7 Nov 2012 15:14:29 -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 92021 invoked by uid 99); 7 Nov 2012 15:14:28 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Nov 2012 15:14:28 +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; Wed, 07 Nov 2012 15:14:27 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7DC0523888EA for ; Wed, 7 Nov 2012 15:14:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1406667 - /openjpa/branches/2.2.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedStatementManagerImpl.java Date: Wed, 07 Nov 2012 15:14:07 -0000 To: commits@openjpa.apache.org From: curtisr7@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121107151407.7DC0523888EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: curtisr7 Date: Wed Nov 7 15:14:07 2012 New Revision: 1406667 URL: http://svn.apache.org/viewvc?rev=1406667&view=rev Log: OPENJPA-2264: Change PreparedStatementManagerImpl.logSQLWarnings to take a Statement rather than a PreparedStatement. Merged from trunk. Modified: openjpa/branches/2.2.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedStatementManagerImpl.java Modified: openjpa/branches/2.2.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedStatementManagerImpl.java URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedStatementManagerImpl.java?rev=1406667&r1=1406666&r2=1406667&view=diff ============================================================================== --- openjpa/branches/2.2.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedStatementManagerImpl.java (original) +++ openjpa/branches/2.2.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedStatementManagerImpl.java Wed Nov 7 15:14:07 2012 @@ -23,6 +23,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.SQLWarning; +import java.sql.Statement; import java.util.ArrayList; import java.util.Collection; import java.util.LinkedList; @@ -293,7 +294,7 @@ public class PreparedStatementManagerImp * Provided the JDBC log category is logging warnings, this method will * log any SQL warnings that result from the execution of a SQL statement. */ - protected void logSQLWarnings(PreparedStatement stmt) { + protected void logSQLWarnings(Statement stmt) { if (stmt != null && _log != null && _log.isTraceEnabled()) { try { SQLWarning warn = stmt.getWarnings();