Skip to content

Commit 57df07b

Browse files
committed
XStream.createObjectInputStream does not pass the DataHolder (Closes #171).
1 parent 8519a40 commit 57df07b

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

xstream-distribution/src/content/changes.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ <h2>Minor changes</h2>
9898
<ul>
9999
<li>XmlFriendlyNameCoder supports now XML parsers implementing only 4th edition of XML 1.0 specification.</li>
100100
<li>Fix support of CDATA events in StAX.</li>
101+
<li>GHI:#171: XStream.createObjectInputStream does not pass the DataHolder.</li>
101102
<li>GHI:#151: Use of SPDX license identifier in POM and Manifest.</li>
102103
<li>GHI:#152: Declare OSGi import of internal runtime packages as optional.</li>
103104
<li>Drop Require-Capability entry in manifest.</li>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2007,7 +2007,7 @@ public Object readFromStream() throws EOFException {
20072007
throw new EOFException();
20082008
}
20092009
reader.moveDown();
2010-
final Object result = unmarshal(reader, dataHolder);
2010+
final Object result = unmarshal(reader, null, dataHolder);
20112011
reader.moveUp();
20122012
return result;
20132013
}

0 commit comments

Comments
 (0)