modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/SystemSettingsPasswordObfuscationTask.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
New commits: commit 1e6238285d93de143c799ca0f2982864916658cb Author: Lukas Krejci lkrejci@redhat.com Date: Mon Oct 21 20:32:41 2013 +0200
[BZ 743558] - Don't fall over on unset password fields without defaults in system settings
diff --git a/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/SystemSettingsPasswordObfuscationTask.java b/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/SystemSettingsPasswordObfuscationTask.java index b2d3513..e48641b 100644 --- a/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/SystemSettingsPasswordObfuscationTask.java +++ b/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/SystemSettingsPasswordObfuscationTask.java @@ -56,6 +56,10 @@ public class SystemSettingsPasswordObfuscationTask implements DatabaseUpgradeTas String value = (String) row[1]; String defaultValue = (String) row[2];
+ if (value == null && defaultValue == null) { + continue; + } + sql = "UPDATE rhq_system_config SET "; try { if (value != null) { @@ -74,7 +78,11 @@ public class SystemSettingsPasswordObfuscationTask implements DatabaseUpgradeTas
sql += " WHERE id = " + settingId;
- type.executeSql(connection, sql); + try { + type.executeSql(connection, sql); + } catch (SQLException e) { + throw new SQLException("Failed to update the password field. The SQL statement was: " + sql, e); + } } } }
rhq-commits@lists.fedorahosted.org