[FIXED HUDSON-5769] Update to XStream 1.3.1-hudson-6 where I added

protected Converter createDefaultConverter().  This allows a subclass
to override the default converter (was hardcoded to ReflectionConverter)
which is also given to the constructor of a few other converters,
most notably ThrowableConverter.  Override this method in XStream2 to
provide a RobustReflectionConverter so missing fields in classes
extending Throwable are handled properly.


git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@28141 71c3de6d-444a-0410-be80-ed276b4c234a
This commit is contained in:
mindless committed 2010-03-02 18:55:42 +00:00
1 parent e576992c90
commit 48df625a44
3 files changed
+43 -8

No files matched your search

+8 -5
View File
@@ -70,20 +70,23 @@ public class XStream2 extends XStream {
return super.unmarshal(reader,root,dataHolder);
}
@Override
protected Converter createDefaultConverter() {
// replace default reflection converter
return new RobustReflectionConverter(getMapper(),new JVM().bestReflectionProvider());
}
private void init() {
// list up types that should be marshalled out like a value, without referencial integrity tracking.
// list up types that should be marshalled out like a value, without referencial integrity tracking.
addImmutableType(Result.class);
registerConverter(new RobustCollectionConverter(getMapper(),getReflectionProvider()),10);
registerConverter(new CopyOnWriteMap.Tree.ConverterImpl(getMapper()),10); // needs to override MapConverter
registerConverter(new DescribableList.ConverterImpl(getMapper()),10); // explicitly added to handle subtypes
registerConverter(new DescribableList.ConverterImpl(getMapper()),10); // explicitly added to handle subtypes
// this should come after all the XStream's default simpler converters,
// but before reflection-based one kicks in.
registerConverter(new AssociatedConverterImpl(this),-10);
// replace default reflection converter
registerConverter(new RobustReflectionConverter(getMapper(),new JVM().bestReflectionProvider()),-19);
}
@Override