You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by ba...@apache.org on 2005/07/21 03:55:41 UTC

svn commit: r219981 - in /incubator/derby/code/branches/10.1/java/client/org/apache/derby: client/am/Connection.java jdbc/ClientBaseDataSource.java

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));
         }