Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 84C20109B5 for ; Mon, 2 Dec 2013 23:32:04 +0000 (UTC) Received: (qmail 94417 invoked by uid 500); 2 Dec 2013 23:32:04 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 94364 invoked by uid 500); 2 Dec 2013 23:32:04 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 94357 invoked by uid 99); 2 Dec 2013 23:32:04 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Dec 2013 23:32:04 +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; Mon, 02 Dec 2013 23:32:03 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 32ACE23888FE; Mon, 2 Dec 2013 23:31:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1547240 - in /commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed: DataSourceXAConnectionFactory.java LocalXAConnectionFactory.java Date: Mon, 02 Dec 2013 23:31:43 -0000 To: commits@commons.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131202233143.32ACE23888FE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Mon Dec 2 23:31:42 2013 New Revision: 1547240 URL: http://svn.apache.org/r1547240 Log: Fix DBCP-404 for the o.a.c.dbcp2.managed package Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/DataSourceXAConnectionFactory.java commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/DataSourceXAConnectionFactory.java URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/DataSourceXAConnectionFactory.java?rev=1547240&r1=1547239&r2=1547240&view=diff ============================================================================== --- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/DataSourceXAConnectionFactory.java (original) +++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/DataSourceXAConnectionFactory.java Mon Dec 2 23:31:42 2013 @@ -31,10 +31,10 @@ import java.sql.SQLException; * @version $Revision$ */ public class DataSourceXAConnectionFactory implements XAConnectionFactory { - protected TransactionRegistry transactionRegistry; // TODO make private? - protected XADataSource xaDataSource; // TODO make private? + private TransactionRegistry transactionRegistry; + private XADataSource xaDataSource; private String username; - protected String password; // TODO make private? + private String password; /** * Creates an DataSourceXAConnectionFactory which uses the specified XADataSource to create database Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java?rev=1547240&r1=1547239&r2=1547240&view=diff ============================================================================== --- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java (original) +++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java Mon Dec 2 23:31:42 2013 @@ -35,8 +35,8 @@ import java.sql.SQLException; * @version $Revision$ */ public class LocalXAConnectionFactory implements XAConnectionFactory { - protected TransactionRegistry transactionRegistry; // TODO make private? - protected ConnectionFactory connectionFactory; // TODO make private? + private TransactionRegistry transactionRegistry; + private ConnectionFactory connectionFactory; /** * Creates an LocalXAConnectionFactory which uses the specified connection factory to create database