From dd8e8f7bfc2fb7e2f5f2d4e42bd06d46dc3c52f7 Mon Sep 17 00:00:00 2001
From: dvrzalik <dvrzalik@71c3de6d-444a-0410-be80-ed276b4c234a>
Date: Wed, 19 Mar 2008 14:47:44 +0000
Subject: [PATCH] Use global XStream object for parsing incoming config.xml (to
 be able to find project class aliases).

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@7867 71c3de6d-444a-0410-be80-ed276b4c234a
---
 core/src/main/java/hudson/model/Job.java | 46 +++++++++++++-----------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/core/src/main/java/hudson/model/Job.java b/core/src/main/java/hudson/model/Job.java
index 955d92498f..3eff1b3720 100644
--- a/core/src/main/java/hudson/model/Job.java
+++ b/core/src/main/java/hudson/model/Job.java
@@ -1,5 +1,6 @@
 package hudson.model;
 
+import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
 import hudson.ExtensionPoint;
 import hudson.StructuredForm;
 import hudson.Util;
@@ -23,9 +24,31 @@ import hudson.util.ShiftedCategoryAxis;
 import hudson.util.StackedAreaRenderer2;
 import hudson.util.TextFile;
 import hudson.widgets.HistoryWidget;
-import hudson.widgets.HistoryWidget.Adapter;
 import hudson.widgets.Widget;
+import hudson.widgets.HistoryWidget.Adapter;
+
+import java.awt.Color;
+import java.awt.Paint;
+import java.io.File;
+import java.io.IOException;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.SortedMap;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletResponse;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+
 import net.sf.json.JSONObject;
+
 import org.apache.tools.ant.taskdefs.Copy;
 import org.apache.tools.ant.types.FileSet;
 import org.jfree.chart.ChartFactory;
@@ -43,25 +66,6 @@ import org.kohsuke.stapler.StaplerResponse;
 import org.kohsuke.stapler.WebMethod;
 import org.kohsuke.stapler.export.Exported;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletResponse;
-import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-import java.awt.*;
-import java.io.File;
-import java.io.IOException;
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.SortedMap;
-
 /**
  * A job is an runnable entity under the monitoring of Hudson.
  *
@@ -771,7 +775,7 @@ public abstract class Job<JobT extends Job<JobT,RunT>, RunT extends Run<JobT,Run
             }
 
             // try to reflect the changes by reloading
-            new XmlFile(out.getTemporaryFile()).unmarshal(this);
+            new XmlFile(Items.XSTREAM, out.getTemporaryFile()).unmarshal(this);
             onLoad(getParent(),getName());
 
             // if everything went well, commit this new version
-- 
GitLab