From 4ec75ea5f9267c20dc6fa9eca0f531a79ed47fd8 Mon Sep 17 00:00:00 2001
From: mindless <mindless@71c3de6d-444a-0410-be80-ed276b4c234a>
Date: Sun, 1 Nov 2009 00:20:19 +0000
Subject: [PATCH] revert r23341 as it was already fixed in hudson.util.XStream2
 in r23339

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@23395 71c3de6d-444a-0410-be80-ed276b4c234a
---
 .../hudson/model/BuildAuthorizationToken.java   | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/core/src/main/java/hudson/model/BuildAuthorizationToken.java b/core/src/main/java/hudson/model/BuildAuthorizationToken.java
index 61c08f7bde..2af173ca7e 100644
--- a/core/src/main/java/hudson/model/BuildAuthorizationToken.java
+++ b/core/src/main/java/hudson/model/BuildAuthorizationToken.java
@@ -23,11 +23,7 @@
  */
 package hudson.model;
 
-import com.thoughtworks.xstream.converters.Converter;
-import com.thoughtworks.xstream.converters.MarshallingContext;
-import com.thoughtworks.xstream.converters.UnmarshallingContext;
-import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
-import com.thoughtworks.xstream.io.HierarchicalStreamReader;
+import com.thoughtworks.xstream.converters.basic.AbstractSingleValueConverter;
 import hudson.Util;
 import hudson.security.ACL;
 import org.kohsuke.stapler.StaplerRequest;
@@ -79,17 +75,18 @@ public final class BuildAuthorizationToken {
         return token;
     }
 
-    public static final class ConverterImpl implements Converter {
+    public static final class ConverterImpl extends AbstractSingleValueConverter {
         public boolean canConvert(Class type) {
             return type== BuildAuthorizationToken.class;
         }
 
-        public void marshal(Object source, HierarchicalStreamWriter writer, MarshallingContext context) {
-            writer.setValue(((BuildAuthorizationToken) source).token);
+        public Object fromString(String str) {
+            return new BuildAuthorizationToken(str);
         }
 
-        public Object unmarshal(HierarchicalStreamReader reader, final UnmarshallingContext context) {
-            return new BuildAuthorizationToken(reader.getValue());
+        @Override
+        public String toString(Object obj) {
+            return ((BuildAuthorizationToken)obj).token;
         }
     }
 }
-- 
GitLab