From f5ee68555689c6ea44b07bb02bcc1b33aba8656f Mon Sep 17 00:00:00 2001 From: Kai Kreuzer Date: Sun, 24 Jan 2021 21:15:19 +0100 Subject: [PATCH] Fixed errrornous urls from merged private branch Signed-off-by: Kai Kreuzer --- .../communicator/message/XmlRpcResponse.java | 6 +++--- .../internal/util/UpnpXMLParser.java | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/communicator/message/XmlRpcResponse.java b/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/communicator/message/XmlRpcResponse.java index 19bef988706..320c0097ba6 100644 --- a/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/communicator/message/XmlRpcResponse.java +++ b/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/communicator/message/XmlRpcResponse.java @@ -47,9 +47,9 @@ public class XmlRpcResponse implements RpcResponse { throws SAXException, ParserConfigurationException, IOException { SAXParserFactory factory = SAXParserFactory.newInstance(); SAXParser saxParser = factory.newSAXParser(); - factory.setFeature("https://xml.org/sax/features/external-general-entities", false); - saxParser.getXMLReader().setFeature("https://xml.org/sax/features/external-general-entities", false); - factory.setFeature("https://apache.org/xml/features/disallow-doctype-decl", true); + factory.setFeature("http://xml.org/sax/features/external-general-entities", false); + saxParser.getXMLReader().setFeature("http://xml.org/sax/features/external-general-entities", false); + factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true); InputSource inputSource = new InputSource(is); inputSource.setEncoding(encoding); saxParser.parse(inputSource, new XmlRpcHandler()); diff --git a/bundles/org.openhab.binding.upnpcontrol/src/main/java/org/openhab/binding/upnpcontrol/internal/util/UpnpXMLParser.java b/bundles/org.openhab.binding.upnpcontrol/src/main/java/org/openhab/binding/upnpcontrol/internal/util/UpnpXMLParser.java index 7fd1d7d6228..425057b156a 100644 --- a/bundles/org.openhab.binding.upnpcontrol/src/main/java/org/openhab/binding/upnpcontrol/internal/util/UpnpXMLParser.java +++ b/bundles/org.openhab.binding.upnpcontrol/src/main/java/org/openhab/binding/upnpcontrol/internal/util/UpnpXMLParser.java @@ -79,9 +79,9 @@ public class UpnpXMLParser { try { SAXParserFactory factory = SAXParserFactory.newInstance(); SAXParser saxParser = factory.newSAXParser(); - factory.setFeature("https://xml.org/sax/features/external-general-entities", false); - saxParser.getXMLReader().setFeature("https://xml.org/sax/features/external-general-entities", false); - factory.setFeature("https://apache.org/xml/features/disallow-doctype-decl", true); + factory.setFeature("http://xml.org/sax/features/external-general-entities", false); + saxParser.getXMLReader().setFeature("http://xml.org/sax/features/external-general-entities", false); + factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true); saxParser.parse(new InputSource(new StringReader(xml)), handler); } catch (IOException e) { // This should never happen - we're not performing I/O! @@ -138,9 +138,9 @@ public class UpnpXMLParser { try { SAXParserFactory factory = SAXParserFactory.newInstance(); SAXParser saxParser = factory.newSAXParser(); - factory.setFeature("https://xml.org/sax/features/external-general-entities", false); - saxParser.getXMLReader().setFeature("https://xml.org/sax/features/external-general-entities", false); - factory.setFeature("https://apache.org/xml/features/disallow-doctype-decl", true); + factory.setFeature("http://xml.org/sax/features/external-general-entities", false); + saxParser.getXMLReader().setFeature("http://xml.org/sax/features/external-general-entities", false); + factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true); saxParser.parse(new InputSource(new StringReader(xml)), handler); } catch (IOException e) { // This should never happen - we're not performing I/O! @@ -185,9 +185,9 @@ public class UpnpXMLParser { try { SAXParserFactory factory = SAXParserFactory.newInstance(); SAXParser saxParser = factory.newSAXParser(); - factory.setFeature("https://xml.org/sax/features/external-general-entities", false); - saxParser.getXMLReader().setFeature("https://xml.org/sax/features/external-general-entities", false); - factory.setFeature("https://apache.org/xml/features/disallow-doctype-decl", true); + factory.setFeature("http://xml.org/sax/features/external-general-entities", false); + saxParser.getXMLReader().setFeature("http://xml.org/sax/features/external-general-entities", false); + factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true); saxParser.parse(new InputSource(new StringReader(xml)), handler); } catch (IOException e) { // This should never happen - we're not performing I/O!