Skip to content
Permalink
Browse files
[FIXED JENKINS-40914] Use Jenkins.XSTREAM2 for deserializing config f…
…iles

Switched all XmlFile instances to use Jenkins.XSTREAM2 instead of the default one
  • Loading branch information
stephenc committed Jan 26, 2017
2 parents 1e606c9 + b74f78d commit e03e9b30d62d4683d587fa6a775904e089296e9a
@@ -181,7 +181,7 @@ public boolean filter(Object context, Descriptor descriptor) {
*/
public static XmlFile getConfigFile() {
// TODO switch to Jenkins.getInstance() once 2.0+ is the baseline
return new XmlFile(new File(Jenkins.getActiveInstance().getRootDir(), "credentials-configuration.xml"));
return new XmlFile(Jenkins.XSTREAM2, new File(Jenkins.getActiveInstance().getRootDir(), "credentials-configuration.xml"));
}

/**
@@ -123,7 +123,7 @@ public SystemCredentialsProvider() {
*/
public static XmlFile getConfigFile() {
// TODO switch to Jenkins.getInstance() once 2.0+ is the baseline
return new XmlFile(new File(Jenkins.getActiveInstance().getRootDir(), "credentials.xml"));
return new XmlFile(Jenkins.XSTREAM2, new File(Jenkins.getActiveInstance().getRootDir(), "credentials.xml"));
}

/**

0 comments on commit e03e9b3

Please sign in to comment.