root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

SPR-8341 - Spring OXM CastorMarshaller unmarshalling methods

This commit is contained in:
Arjen Poutsma 2011-06-15 11:09:58 +00:00
parent 3b1190121f
commit 680f9692c8
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
org.springframework.oxm/src/main/java/org/springframework/oxm/castor/CastorMarshaller.java
View File

@ -575,17 +575,6 @@ public class CastorMarshaller extends AbstractMarshaller implements Initializing
}
}
@Override
protected final Object unmarshalXmlEventReader(XMLEventReader eventReader) {
XMLReader reader = StaxUtils.createXMLReader(eventReader);
try {
return unmarshalSaxReader(reader, new InputSource());
}
catch (IOException ex) {
throw new UnmarshallingFailureException("Failed to read XML stream", ex);
}
}
@Override
protected final Object unmarshalSaxReader(XMLReader xmlReader, InputSource inputSource)
throws XmlMappingException, IOException {
@ -603,13 +592,22 @@ public class CastorMarshaller extends AbstractMarshaller implements Initializing
}
@Override
protected final Object unmarshalXmlStreamReader(XMLStreamReader streamReader) {
XMLReader reader = StaxUtils.createXMLReader(streamReader);
protected final Object unmarshalXmlEventReader(XMLEventReader eventReader) {
try {
return unmarshalSaxReader(reader, new InputSource());
return createUnmarshaller().unmarshal(eventReader);
}
catch (IOException ex) {
throw new UnmarshallingFailureException("Failed to read XML stream", ex);
catch (XMLException ex) {
throw convertCastorException(ex, false);
}
}
@Override
protected final Object unmarshalXmlStreamReader(XMLStreamReader streamReader) {
try {
return createUnmarshaller().unmarshal(streamReader);
}
catch (XMLException ex) {
throw convertCastorException(ex, false);
}
}