You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ce...@apache.org on 2022/02/08 14:33:33 UTC

svn commit: r1897874 - /xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Locale.java

Author: centic
Date: Tue Feb  8 14:33:33 2022
New Revision: 1897874

URL: http://svn.apache.org/viewvc?rev=1897874&view=rev
Log:
XMLBEANS-597: Rework changes for Android some more

The exception actually happens at a later point, so we
have to provide a way for users to control the feature
via system-properties.

Modified:
    xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Locale.java

Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Locale.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Locale.java?rev=1897874&r1=1897873&r2=1897874&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Locale.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Locale.java Tue Feb  8 14:33:33 2022
@@ -2493,12 +2493,12 @@ public final class Locale
 
             try {
                 _xr.setFeature(
-                    "http://xml.org/sax/features/namespace-prefixes", true);
+                    "http://xml.org/sax/features/namespace-prefixes",
+                        // when using XMLBeans on Android, it fails when both features
+                        // namespaces and namespace-prefixes are defined although the spec
+                        // so we allow users to set this one differently as a workaround
+                        Boolean.valueOf(System.getProperty("xmlbeans.saxloader.namespace-prefixes", "true")));
                 _xr.setFeature("http://xml.org/sax/features/namespaces", true);
-            } catch (Throwable e) {
-                LOG.atWarn().withThrowable(e).log("SAX Namespoace handling is not supported");
-            }
-            try {
                 _xr.setFeature("http://xml.org/sax/features/validation", false);
                 _xr.setProperty(
                     "http://xml.org/sax/properties/lexical-handler", this);



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org