Title: [1969] trunk: Method marshalUnserializableParent of SerializableConverter is protected now to skip the default mechanism in a derived converter that uses the default constructor to create the original type (as an alternative for XSTR-695).
Revision
1969
Author
joehni
Date
2012-03-22 18:13:24 -0500 (Thu, 22 Mar 2012)

Log Message

Method marshalUnserializableParent of SerializableConverter is protected now to skip the default mechanism in a derived converter that uses the default constructor to create the original type (as an alternative for XSTR-695).

Modified Paths

Diff

Modified: trunk/xstream/src/java/com/thoughtworks/xstream/converters/reflection/SerializableConverter.java (1968 => 1969)


--- trunk/xstream/src/java/com/thoughtworks/xstream/converters/reflection/SerializableConverter.java	2012-03-21 01:17:55 UTC (rev 1968)
+++ trunk/xstream/src/java/com/thoughtworks/xstream/converters/reflection/SerializableConverter.java	2012-03-22 23:13:24 UTC (rev 1969)
@@ -260,7 +260,7 @@
         }
     }
 
-    private void marshalUnserializableParent(final HierarchicalStreamWriter writer, final MarshallingContext context, final Object replacedSource) {
+    protected void marshalUnserializableParent(final HierarchicalStreamWriter writer, final MarshallingContext context, final Object replacedSource) {
         writer.startNode(ELEMENT_UNSERIALIZABLE_PARENTS);
         super.doMarshal(replacedSource, writer, context);
         writer.endNode();

Modified: trunk/xstream-distribution/src/content/changes.html (1968 => 1969)


--- trunk/xstream-distribution/src/content/changes.html	2012-03-21 01:17:55 UTC (rev 1968)
+++ trunk/xstream-distribution/src/content/changes.html	2012-03-22 23:13:24 UTC (rev 1969)
@@ -52,6 +52,9 @@
     	<li>JIRA:XSTR-685: Deserialization from file or URL keeps stream open.</li>
     	<li>JIRA:XSTR-684: XML 1.0 character validation fails for characters from 0x10 to 0x1f.</li>
     	<li>SerializableConverter is broken if the serialized type is the default implementation.</li>
+    	<li>Method marshalUnserializableParent of SerializableConverter is protected now to skip the default mechanism
+    	in a derived converter that uses the default constructor to create the original type (as an alternative for
+    	JIRA:XSTR-695).</li>
     	<li>FieldDictionary may call sort of FieldKeySorter implementation with wrong type as key.</li>
     </ul>
 

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to