Avoid 2nd CustomObjectoutputStream in marshalling process.

Author: joehni

xstream/src/java/com/thoughtworks/xstream/XStream.java

@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2003, 2004, 2005, 2006 Joe Walnes.
- * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 XStream Committers.
+ * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 XStream Committers.
  * All rights reserved.
  *
  * The software in this package is published under the terms of the BSD
@@ -1915,12 +1915,13 @@ public ObjectOutputStream createObjectOutputStream(final HierarchicalStreamWrite
     public ObjectOutputStream createObjectOutputStream(final HierarchicalStreamWriter writer, final String rootNodeName,
             final DataHolder dataHolder)
             throws IOException {
+        final DataHolder context = dataHolder != null ? dataHolder : new MapBackedDataHolder();
         final StatefulWriter statefulWriter = new StatefulWriter(writer);
         statefulWriter.startNode(rootNodeName, null);
-        return new CustomObjectOutputStream(new CustomObjectOutputStream.StreamCallback() {
+        return new CustomObjectOutputStream(context, new CustomObjectOutputStream.StreamCallback() {
             @Override
             public void writeToStream(final Object object) {
-                marshal(object, statefulWriter, dataHolder);
+                marshal(object, statefulWriter, context);
             }
 
             @Override

xstream/src/java/com/thoughtworks/xstream/core/JVM.java

@@ -187,7 +187,7 @@ public int compare(final Object o1, final Object o2) {
         canParseISO8601TimeZoneInDateFormat = test;
         try {
             @SuppressWarnings("resource")
-            final CustomObjectOutputStream stream = new CustomObjectOutputStream(null);
+            final CustomObjectOutputStream stream = new CustomObjectOutputStream(null, null);
             test = stream != null;
         } catch (final RuntimeException e) {
             test = false;

xstream/src/java/com/thoughtworks/xstream/core/util/CustomObjectOutputStream.java

@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2004, 2005 Joe Walnes.
- * Copyright (C) 2006, 2007, 2014, 2016 XStream Committers.
+ * Copyright (C) 2006, 2007, 2014, 2016, 2020 XStream Committers.
  * All rights reserved.
  *
  * The software in this package is published under the terms of the BSD
@@ -34,8 +34,7 @@ public static synchronized CustomObjectOutputStream getInstance(final DataHolder
         try {
             CustomObjectOutputStream result = (CustomObjectOutputStream)whereFrom.get(DATA_HOLDER_KEY);
             if (result == null) {
-                result = new CustomObjectOutputStream(callback);
-                whereFrom.put(DATA_HOLDER_KEY, result);
+                result = new CustomObjectOutputStream(whereFrom, callback);
             } else {
                 result.pushCallback(callback);
             }
@@ -66,8 +65,12 @@ public static interface StreamCallback {
      * @see #getInstance(com.thoughtworks.xstream.converters.DataHolder,
      *      com.thoughtworks.xstream.core.util.CustomObjectOutputStream.StreamCallback)
      */
-    public CustomObjectOutputStream(final StreamCallback callback) throws IOException, SecurityException {
+    public CustomObjectOutputStream(final DataHolder dataHolder, final StreamCallback callback)
+            throws IOException, SecurityException {
         callbacks.push(callback);
+        if (dataHolder != null) {
+            dataHolder.put(DATA_HOLDER_KEY, this);
+        }
     }
 
     /**