Skip to content

Commit

Permalink
Merge pull request #791 from basil/xstream
Browse files Browse the repository at this point in the history
Use controller-wide default XStream driver where possible
  • Loading branch information
jglick authored Sep 19, 2023
2 parents 66575f7 + bd6ebca commit ac0338e
Showing 1 changed file with 2 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
import hudson.Main;
import hudson.Util;
import hudson.model.Result;
import hudson.util.XStream2;
import jenkins.model.Jenkins;
import jenkins.util.Timer;
import org.jenkinsci.plugins.workflow.actions.ErrorAction;
Expand Down Expand Up @@ -597,7 +598,7 @@ public void saveProgram(File f) throws IOException {

@CpsVmThreadOnly
String asXml() {
XStream xs = new XStream();
XStream xs = new XStream(XStream2.getDefaultDriver());
// Could not handle a general PickleFactory without doing something weird with XStream
// and there is no apparent way to make a high-priority generic Convertor delegate to others.
// Anyway the only known exceptions are ThrowablePickle, which we are unlikely to need,
Expand Down

0 comments on commit ac0338e

Please sign in to comment.