db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From krist...@apache.org
Subject svn commit: r1165222 - in /db/derby/code/branches/10.8: ./ java/engine/org/apache/derby/jdbc/Driver20.java
Date Mon, 05 Sep 2011 09:34:00 GMT
Author: kristwaa
Date: Mon Sep  5 09:34:00 2011
New Revision: 1165222

URL: http://svn.apache.org/viewvc?rev=1165222&view=rev
Log:
DERBY-5402: Assignment instead of comparison in Driver20.getPropertyInfo

Merged fix from trunk (revision 1165221).

Modified:
    db/derby/code/branches/10.8/   (props changed)
    db/derby/code/branches/10.8/java/engine/org/apache/derby/jdbc/Driver20.java

Propchange: db/derby/code/branches/10.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep  5 09:34:00 2011
@@ -1,2 +1,2 @@
 /db/derby/code/branches/10.7:1061570,1061578,1082235
-/db/derby/code/trunk:1063809,1088633,1089795,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1095247,1096741,1096890,1096991,1097247,1097249,1097460,1097469,1097471,1098033,1101059,1101839,1102620,1102826,1103681,1103718,1103742,1125305,1126358,1126468,1127825,1127883,1128243,1128942,1129136,1129764,1129797,1130077,1130084,1130632,1130895,1131030,1131272,1132546,1132664,1132747,1132860,1132928,1133304,1133317,1133741,1133752,1134139,1136363,1136371,1136397,1136844,1137213,1138201,1138341,1138444,1138787,1138795,1139449,1139451,1140222,1140744,1141924,1142583,1142635,1145057,1146644,1146915,1146962,1147219,1147242,1147335,1148344,1148354,1148429,1148658,1149054,1149090,1149270,1149482,1149662,1151101,1151612,1158108,1160593,1160597,1161208,1163616,1164358,1164370
+/db/derby/code/trunk:1063809,1088633,1089795,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1095247,1096741,1096890,1096991,1097247,1097249,1097460,1097469,1097471,1098033,1101059,1101839,1102620,1102826,1103681,1103718,1103742,1125305,1126358,1126468,1127825,1127883,1128243,1128942,1129136,1129764,1129797,1130077,1130084,1130632,1130895,1131030,1131272,1132546,1132664,1132747,1132860,1132928,1133304,1133317,1133741,1133752,1134139,1136363,1136371,1136397,1136844,1137213,1138201,1138341,1138444,1138787,1138795,1139449,1139451,1140222,1140744,1141924,1142583,1142635,1145057,1146644,1146915,1146962,1147219,1147242,1147335,1148344,1148354,1148429,1148658,1149054,1149090,1149270,1149482,1149662,1151101,1151612,1158108,1160593,1160597,1161208,1163616,1164358,1164370,1165221

Modified: db/derby/code/branches/10.8/java/engine/org/apache/derby/jdbc/Driver20.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/engine/org/apache/derby/jdbc/Driver20.java?rev=1165222&r1=1165221&r2=1165222&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/engine/org/apache/derby/jdbc/Driver20.java (original)
+++ db/derby/code/branches/10.8/java/engine/org/apache/derby/jdbc/Driver20.java Mon Sep  5
09:34:00 2011
@@ -134,7 +134,7 @@ public abstract class Driver20 extends I
 		boolean encryptDB = Boolean.valueOf(finfo.getProperty(Attribute.DATA_ENCRYPTION)).booleanValue();
	
 		String encryptpassword = finfo.getProperty(Attribute.BOOT_PASSWORD);
 
-		if (dbname.length() == 0 || (encryptDB = true && encryptpassword == null)) {
+		if (dbname.length() == 0 || (encryptDB && encryptpassword == null)) {
 
 			// with no database name we can have shutdown or a database name
 



Mime
View raw message