db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r426398 - in /db/derby/code/trunk/java: engine/org/apache/derby/jdbc/ testing/org/apache/derbyTesting/functionTests/suites/ testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/
Date Fri, 28 Jul 2006 06:15:27 GMT
Author: kahatlen
Date: Thu Jul 27 23:15:26 2006
New Revision: 426398

URL: http://svn.apache.org/viewvc?rev=426398&view=rev
Log:
DERBY-1586: The attributesAsPassword property doesn't work correctly
with EmbeddedConnectionPoolDataSource

Forward the requestPassword parameter from createPooledConnection() to
EmbedPooledConnection's constructor.

Added:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourcePropertiesTest_app.properties
  (with props)
Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java
    db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource40.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdbcapi.runall

Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java?rev=426398&r1=426397&r2=426398&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java
Thu Jul 27 23:15:26 2006
@@ -95,10 +95,10 @@
     /**
      * create and returns EmbedPooledConnection.
      */
-        protected PooledConnection createPooledConnection (String user, 
-                String password, boolean requestPAssword) throws SQLException {
-            return new EmbedPooledConnection(this, user, password, true);
-        }
+    protected PooledConnection createPooledConnection (String user,
+            String password, boolean requestPassword) throws SQLException {
+        return new EmbedPooledConnection(this, user, password, requestPassword);
+    }
 }
 
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource40.java?rev=426398&r1=426397&r2=426398&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource40.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource40.java
Thu Jul 27 23:15:26 2006
@@ -130,8 +130,9 @@
      * create and returns EmbedPooledConnection.
      */
     protected PooledConnection createPooledConnection (String user, 
-            String password, boolean requestPAssword)  throws SQLException {
-        return new EmbedPooledConnection40 (this, user, password, true);
+            String password, boolean requestPassword)  throws SQLException {
+        return new EmbedPooledConnection40(this, user, password,
+                                           requestPassword);
     }    
         
 }

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdbcapi.runall
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdbcapi.runall?rev=426398&r1=426397&r2=426398&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdbcapi.runall
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdbcapi.runall
Thu Jul 27 23:15:26 2006
@@ -2,6 +2,7 @@
 jdbcapi/bestrowidentifier.sql
 jdbcapi/characterStreams.java
 jdbcapi/checkDriver.java
+jdbcapi/DataSourcePropertiesTest.junit
 jdbcapi/derbyStress.java
 jdbcapi/nullSQLText.java
 jdbcapi/prepStmtMetaData.java

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourcePropertiesTest_app.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourcePropertiesTest_app.properties?rev=426398&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourcePropertiesTest_app.properties
(added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourcePropertiesTest_app.properties
Thu Jul 27 23:15:26 2006
@@ -0,0 +1,7 @@
+# Don't attempt to run the test with these vms since they don't
+# support XADataSource
+runwithfoundation=false
+runwithj9=false
+runwithjdk13=false
+runwithibm13=false
+usedefaults=true

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourcePropertiesTest_app.properties
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message