Return-Path: X-Original-To: apmail-cayenne-commits-archive@www.apache.org Delivered-To: apmail-cayenne-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 1BBFA9F79 for ; Wed, 25 Jan 2012 14:07:56 +0000 (UTC) Received: (qmail 82783 invoked by uid 500); 25 Jan 2012 14:07:56 -0000 Delivered-To: apmail-cayenne-commits-archive@cayenne.apache.org Received: (qmail 82748 invoked by uid 500); 25 Jan 2012 14:07:55 -0000 Mailing-List: contact commits-help@cayenne.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cayenne.apache.org Delivered-To: mailing list commits@cayenne.apache.org Received: (qmail 82741 invoked by uid 99); 25 Jan 2012 14:07:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Jan 2012 14:07:54 +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, 25 Jan 2012 14:07:51 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C4901238890D for ; Wed, 25 Jan 2012 14:07:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1235748 - /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/XMLPoolingDataSourceFactory.java Date: Wed, 25 Jan 2012 14:07:30 -0000 To: commits@cayenne.apache.org From: oltka@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120125140730.C4901238890D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: oltka Date: Wed Jan 25 14:07:30 2012 New Revision: 1235748 URL: http://svn.apache.org/viewvc?rev=1235748&view=rev Log: CAY-1654 Can't switch DataSource Factory on certain projects Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/XMLPoolingDataSourceFactory.java Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/XMLPoolingDataSourceFactory.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/XMLPoolingDataSourceFactory.java?rev=1235748&r1=1235747&r2=1235748&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/XMLPoolingDataSourceFactory.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/XMLPoolingDataSourceFactory.java Wed Jan 25 14:07:30 2012 @@ -51,6 +51,7 @@ public class XMLPoolingDataSourceFactory public DataSource getDataSource(DataNodeDescriptor nodeDescriptor) throws Exception { DataSourceInfo dataSourceDescriptor = nodeDescriptor.getDataSourceDescriptor(); + if (dataSourceDescriptor == null) { String message = "Null dataSourceDescriptor for nodeDescriptor '" @@ -60,14 +61,19 @@ public class XMLPoolingDataSourceFactory throw new ConfigurationException(message); } + String driver = (dataSourceDescriptor.getJdbcDriver() == null)? "": dataSourceDescriptor.getJdbcDriver(); + String dataSourceUrl = (dataSourceDescriptor.getDataSourceUrl() == null)? "": dataSourceDescriptor.getDataSourceUrl(); + String userName = (dataSourceDescriptor.getUserName() == null)? "": dataSourceDescriptor.getUserName(); + String password = (dataSourceDescriptor.getPassword() == null)? "": dataSourceDescriptor.getPassword(); + try { return new PoolManager( - dataSourceDescriptor.getJdbcDriver(), - dataSourceDescriptor.getDataSourceUrl(), + driver, + dataSourceUrl, dataSourceDescriptor.getMinConnections(), dataSourceDescriptor.getMaxConnections(), - dataSourceDescriptor.getUserName(), - dataSourceDescriptor.getPassword(), + userName, + password, jdbcEventLogger); } catch (Exception e) {