db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r1404944 - in /db/derby/code/trunk/java: engine/org/apache/derby/impl/jdbc/EmbedConnection.java testing/org/apache/derbyTesting/functionTests/master/URLCheck.out
Date Fri, 02 Nov 2012 12:23:52 GMT
Author: rhillegas
Date: Fri Nov  2 12:23:52 2012
New Revision: 1404944

URL: http://svn.apache.org/viewvc?rev=1404944&view=rev
Log:
DERBY-5970: Forbid illegal settings of the dataEncryption attribute.

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/URLCheck.out

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java?rev=1404944&r1=1404943&r2=1404944&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java Fri Nov
 2 12:23:52 2012
@@ -773,7 +773,7 @@ public class EmbedConnection implements 
     private boolean isCryptoBoot(Properties p)
         throws SQLException
     {
-        return (isTrue(p, Attribute.DATA_ENCRYPTION) ||
+        return (vetTrue(p, Attribute.DATA_ENCRYPTION) ||
                 vetTrue(p, Attribute.DECRYPT_DATABASE) ||
                 isSet(p, Attribute.NEW_BOOT_PASSWORD) ||
                 isSet(p, Attribute.NEW_CRYPTO_EXTERNAL_KEY));

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/URLCheck.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/URLCheck.out?rev=1404944&r1=1404943&r2=1404944&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/URLCheck.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/URLCheck.out
Fri Nov  2 12:23:52 2012
@@ -26,11 +26,12 @@ URL Attribute [dataEncryption=true]
    Attribute is a duplicate.
 URL Attribute [dataEncryption=false]
    Attribute is a duplicate.
-ij(CONNECTION3)> -- Perform case check.
+ERROR XJ05B: JDBC attribute 'dataEncryption' has an invalid value 'false', valid values are
'true'.
+ij(CONNECTION2)> -- Perform case check.
 connect 'jdbc:derby:wombat;dataencryption=true';
 URL Attribute [dataencryption=true]
    Attribute is unknown to Derby.
-ij(CONNECTION4)> -- Check for true/false.
+ij(CONNECTION3)> -- Check for true/false.
 connect 'jdbc:derby:wombat;dataEncryption=x';
 ERROR XJ05B: JDBC attribute 'dataEncryption' has an invalid value 'x', valid values are '{true|false}'.
-ij(CONNECTION4)> 
+ij(CONNECTION3)> 



Mime
View raw message