Changeset 13715 in josm for trunk/src/org

Timestamp:

2018-05-08T12:37:26+02:00 (6 years ago)

Author:

Don-vip

Message:

see #16047 - implement workaround against problem seen with IcedTeaWeb 1.7.1 / Java 9 on Debian

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/preferences/PreferencesReader.java (modified) (2 diffs)
• tools/Utils.java (modified) (3 diffs)
• tools/XmlObjectParser.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/preferences/PreferencesReader.java

@@ -27 +27 @@
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.validation.Schema;
-import javax.xml.validation.SchemaFactory;
 import javax.xml.validation.Validator;
 
 import org.openstreetmap.josm.io.CachedFile;
 import org.openstreetmap.josm.io.XmlStreamParsingException;
-import org.openstreetmap.josm.spi.preferences.Setting;
 import org.openstreetmap.josm.spi.preferences.ListListSetting;
 import org.openstreetmap.josm.spi.preferences.ListSetting;
 import org.openstreetmap.josm.spi.preferences.MapListSetting;
+import org.openstreetmap.josm.spi.preferences.Setting;
 import org.openstreetmap.josm.spi.preferences.StringSetting;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.Utils;
 import org.xml.sax.SAXException;
 
@@ -97 +97 @@
     public static void validateXML(Reader in) throws IOException, SAXException {
         try (CachedFile cf = new CachedFile("resource://data/preferences.xsd"); InputStream xsdStream = cf.getInputStream()) {
-            Schema schema = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI).newSchema(new StreamSource(xsdStream));
+            Schema schema = Utils.newXmlSchemaFactory().newSchema(new StreamSource(xsdStream));
             Validator validator = schema.newValidator();
             validator.validate(new StreamSource(in));

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -48 +48 @@
 import java.util.Locale;
 import java.util.Optional;
+import java.util.ServiceConfigurationError;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executor;
@@ -71 +72 @@
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
+import javax.xml.validation.SchemaFactory;
 
 import org.openstreetmap.josm.spi.preferences.Config;
@@ -1327 +1329 @@
         }
         return null;
+    }
+
+    /**
+     * Returns the W3C XML Schema factory implementation. Robust method dealing with ContextClassLoader problems.
+     * @return the W3C XML Schema factory implementation
+     * @since 13715
+     */
+    public static SchemaFactory newXmlSchemaFactory() {
+        try {
+            return SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+        } catch (ServiceConfigurationError e) {
+            Logging.debug(e);
+            // Can happen with icedtea-web. Use workaround from https://issues.apache.org/jira/browse/GERONIMO-6185
+            Thread currentThread = Thread.currentThread();
+            ClassLoader old = currentThread.getContextClassLoader();
+            currentThread.setContextClassLoader(null);
+            try {
+                return SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+            } finally {
+                currentThread.setContextClassLoader(old);
+            }
+        }
     }
 

trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java

@@ -18 +18 @@
 import java.util.Stack;
 
-import javax.xml.XMLConstants;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.stream.StreamSource;
@@ -286 +285 @@
      */
     public Iterable<Object> startWithValidation(final Reader in, String namespace, String schemaSource) throws SAXException {
-        SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+        SchemaFactory factory = Utils.newXmlSchemaFactory();
         try (CachedFile cf = new CachedFile(schemaSource); InputStream mis = cf.getInputStream()) {
             Schema schema = factory.newSchema(new StreamSource(mis));