46 lines
2.2 KiB
Diff
46 lines
2.2 KiB
Diff
--- hsqldb-2.4.1/hsqldb/src/org/hsqldb/jdbc/JDBCSQLXML.java 2017-04-09 10:22:34.000000000 +0200
|
|
+++ hsqldb-2.4.1/hsqldb/src/org/hsqldb/jdbc/JDBCSQLXML.java 2018-07-12 08:24:29.507770794 +0200
|
|
@@ -58,8 +58,6 @@
|
|
import java.util.zip.GZIPInputStream;
|
|
import java.util.zip.GZIPOutputStream;
|
|
|
|
-import javax.xml.bind.util.JAXBResult;
|
|
-import javax.xml.bind.util.JAXBSource;
|
|
import javax.xml.parsers.DocumentBuilder;
|
|
import javax.xml.parsers.DocumentBuilderFactory;
|
|
import javax.xml.parsers.FactoryConfigurationError;
|
|
@@ -1462,15 +1460,7 @@
|
|
protected <T extends Source>T getSourceImpl(
|
|
Class<T> sourceClass) throws SQLException {
|
|
|
|
- if (JAXBSource.class.isAssignableFrom(sourceClass)) {
|
|
-
|
|
- // Must go first presently, since JAXBSource extends SAXSource
|
|
- // (purely as an implementation detail) and it's not possible
|
|
- // to instantiate a valid JAXBSource with a Zero-Args
|
|
- // constructor(or any subclass thereof, due to the finality of
|
|
- // its private marshaller and context object attributes)
|
|
- // FALL THROUGH... will throw an exception
|
|
- } else if (StreamSource.class.isAssignableFrom(sourceClass)) {
|
|
+ if (StreamSource.class.isAssignableFrom(sourceClass)) {
|
|
return createStreamSource(sourceClass);
|
|
} else if ((sourceClass == null)
|
|
|| DOMSource.class.isAssignableFrom(sourceClass)) {
|
|
@@ -1683,15 +1673,7 @@
|
|
setWritable(false);
|
|
setReadable(true);
|
|
|
|
- if (JAXBResult.class.isAssignableFrom(resultClass)) {
|
|
-
|
|
- // Must go first presently, since JAXBResult extends SAXResult
|
|
- // (purely as an implementation detail) and it's not possible
|
|
- // to instantiate a valid JAXBResult with a Zero-Args
|
|
- // constructor(or any subclass thereof, due to the finality of
|
|
- // its private UnmarshallerHandler)
|
|
- // FALL THROUGH... will throw an exception
|
|
- } else if ((resultClass == null)
|
|
+ if ((resultClass == null)
|
|
|| StreamResult.class.isAssignableFrom(resultClass)) {
|
|
return createStreamResult(resultClass);
|
|
} else if (DOMResult.class.isAssignableFrom(resultClass)) {
|