Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 4756 invoked from network); 21 Jul 2005 01:55:56 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 21 Jul 2005 01:55:56 -0000 Received: (qmail 248 invoked by uid 500); 21 Jul 2005 01:55:56 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 195 invoked by uid 500); 21 Jul 2005 01:55:55 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 179 invoked by uid 500); 21 Jul 2005 01:55:55 -0000 Delivered-To: apmail-incubator-derby-cvs@incubator.apache.org Received: (qmail 166 invoked by uid 99); 21 Jul 2005 01:55:55 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 20 Jul 2005 18:55:44 -0700 Received: (qmail 4691 invoked by uid 65534); 21 Jul 2005 01:55:41 -0000 Message-ID: <20050721015541.4690.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r219981 - in /incubator/derby/code/branches/10.1/java/client/org/apache/derby: client/am/Connection.java jdbc/ClientBaseDataSource.java Date: Thu, 21 Jul 2005 01:55:41 -0000 To: derby-cvs@incubator.apache.org From: bandaram@apache.org X-Mailer: svnmailer-1.0.2 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: bandaram Date: Wed Jul 20 18:55:40 2005 New Revision: 219981 URL: http://svn.apache.org/viewcvs?rev=219981&view=rev Log: Port trunk change 219256 to 10.1 branch. DERBY-409: This is a potential patch for the issue brought up in DERBY-406 connectionAttributes will now default to null (aka no default) Ported to 10.1 by Satheesh Bandaram (satheesh@sourcery.org) Modified: incubator/derby/code/branches/10.1/java/client/org/apache/derby/client/am/Connection.java incubator/derby/code/branches/10.1/java/client/org/apache/derby/jdbc/ClientBaseDataSource.java Modified: incubator/derby/code/branches/10.1/java/client/org/apache/derby/client/am/Connection.java URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/client/org/apache/derby/client/am/Connection.java?rev=219981&r1=219980&r2=219981&view=diff ============================================================================== --- incubator/derby/code/branches/10.1/java/client/org/apache/derby/client/am/Connection.java (original) +++ incubator/derby/code/branches/10.1/java/client/org/apache/derby/client/am/Connection.java Wed Jul 20 18:55:40 2005 @@ -156,7 +156,11 @@ // Extract common properties. // Derby-409 fix - databaseName_ = dataSource.getDatabaseName() + ";" + dataSource.getConnectionAttributes(); + if (dataSource.getConnectionAttributes() != null) { + databaseName_ = dataSource.getDatabaseName() + ";" + dataSource.getConnectionAttributes(); + } else { + databaseName_ = dataSource.getDatabaseName(); + } retrieveMessageText_ = dataSource.getRetrieveMessageText(); loginTimeout_ = dataSource.getLoginTimeout(); Modified: incubator/derby/code/branches/10.1/java/client/org/apache/derby/jdbc/ClientBaseDataSource.java URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/client/org/apache/derby/jdbc/ClientBaseDataSource.java?rev=219981&r1=219980&r2=219981&view=diff ============================================================================== --- incubator/derby/code/branches/10.1/java/client/org/apache/derby/jdbc/ClientBaseDataSource.java (original) +++ incubator/derby/code/branches/10.1/java/client/org/apache/derby/jdbc/ClientBaseDataSource.java Wed Jul 20 18:55:40 2005 @@ -781,7 +781,7 @@ return getUpgradedSecurityMechanism(securityMechanism, password); } - protected String connectionAttributes = ""; + protected String connectionAttributes = null; /** * Set this property to pass in more Derby specific connection URL attributes. @@ -874,6 +874,10 @@ * when set connection attributes is called. */ protected void updateDataSourceValues(Properties prop) { + if (prop == null) { + return; + } + if (prop.containsKey(propertyKey_user)) { setUser(getUser(prop)); }