You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by mu...@apache.org on 2015/06/18 16:04:19 UTC

svn commit: r1686220 - /santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XalanXPathAPI.java

Author: mullan
Date: Thu Jun 18 14:04:18 2015
New Revision: 1686220

URL: http://svn.apache.org/r1686220
Log:
Check if here function is already registered. The JDK 9 XPath implementation
will include it by default.

Modified:
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XalanXPathAPI.java

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XalanXPathAPI.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XalanXPathAPI.java?rev=1686220&r1=1686219&r2=1686220&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XalanXPathAPI.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XalanXPathAPI.java Thu Jun 18 14:04:18 2015
@@ -163,6 +163,13 @@ public class XalanXPathAPI implements XP
 
     private static synchronized void fixupFunctionTable() {
         installed = false;
+        if (new FunctionTable().functionAvailable("here")) {
+            if (log.isDebugEnabled()) {
+                log.debug("Here function already registered");
+            }
+            installed = true;
+            return;
+        }
         if (log.isDebugEnabled()) {
             log.debug("Registering Here function");
         }