|
|
|
@ -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 { |
|
|
|
@ -602,14 +591,23 @@ public class CastorMarshaller extends AbstractMarshaller implements Initializing |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
protected final Object unmarshalXmlEventReader(XMLEventReader eventReader) { |
|
|
|
|
try { |
|
|
|
|
return createUnmarshaller().unmarshal(eventReader); |
|
|
|
|
} |
|
|
|
|
catch (XMLException ex) { |
|
|
|
|
throw convertCastorException(ex, false); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
protected final Object unmarshalXmlStreamReader(XMLStreamReader streamReader) { |
|
|
|
|
XMLReader reader = StaxUtils.createXMLReader(streamReader); |
|
|
|
|
try { |
|
|
|
|
return unmarshalSaxReader(reader, new InputSource()); |
|
|
|
|
return createUnmarshaller().unmarshal(streamReader); |
|
|
|
|
} |
|
|
|
|
catch (IOException ex) { |
|
|
|
|
throw new UnmarshallingFailureException("Failed to read XML stream", ex); |
|
|
|
|
catch (XMLException ex) { |
|
|
|
|
throw convertCastorException(ex, false); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|