modules/enterprise/agentupdate/src/main/java/org/rhq/enterprise/agent/update/MigrateAgentPreferences.java | 12 ++++------ 1 file changed, 5 insertions(+), 7 deletions(-)
New commits: commit d3ee49b474616fdbd0b3829379520c6da1406ec0 Author: Jay Shaughnessy jshaughn@redhat.com Date: Tue Mar 26 09:56:10 2013 -0400
Bug 824010 Until it's clear we can wipe them, make sure the autoupdater migration task does not wipe the native prefs.
diff --git a/modules/enterprise/agentupdate/src/main/java/org/rhq/enterprise/agent/update/MigrateAgentPreferences.java b/modules/enterprise/agentupdate/src/main/java/org/rhq/enterprise/agent/update/MigrateAgentPreferences.java index 333d9aa..aec7a16 100644 --- a/modules/enterprise/agentupdate/src/main/java/org/rhq/enterprise/agent/update/MigrateAgentPreferences.java +++ b/modules/enterprise/agentupdate/src/main/java/org/rhq/enterprise/agent/update/MigrateAgentPreferences.java @@ -42,16 +42,14 @@ public class MigrateAgentPreferences extends Task { static private final String NODE_PREFIX = NODE_PARENT + NODE_DELIM; static private final String DEFAULT_PREFS_FILE = "agent-prefs.properties"; static private final String MAINTAIN_NATIVE_PREFS_SYSPROP = "rhq.preferences.migrate.keep-native-prefs"; + // Currently keeping native prefs until we're sure we don't need them. + // static private final String MAINTAIN_NATIVE_PREFS_DEFAULT = "false"; + static private final String MAINTAIN_NATIVE_PREFS_DEFAULT = "true"; static private final Boolean MAINTAIN_NATIVE_PREFS;
static { - Boolean sysProp = Boolean.FALSE; - try { - sysProp = Boolean.valueOf(System.getProperty(MAINTAIN_NATIVE_PREFS_SYSPROP, "false")); - } catch (Throwable t) { - sysProp = Boolean.FALSE; - } - MAINTAIN_NATIVE_PREFS = sysProp; + MAINTAIN_NATIVE_PREFS = Boolean.valueOf(System.getProperty(MAINTAIN_NATIVE_PREFS_SYSPROP, + MAINTAIN_NATIVE_PREFS_DEFAULT)); }
private File toDir;
rhq-commits@lists.fedorahosted.org