# HG changeset patch
# User mullan
# Date 1434141605 14400
# Node ID 35889b7bb6e9da78e03a75264be0ddc4e065175c
# Parent  8e60d9bab54b013451a855e02da8a1d4368f1411# Parent  ef5ddf021137b87ca276fd3e11cf381f13853fd4
Merge

diff -r ef5ddf021137 -r 35889b7bb6e9 jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/XalanXPathAPI.java
--- a/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/XalanXPathAPI.java	Fri Jun 12 12:50:41 2015 -0400
+++ b/jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/XalanXPathAPI.java	Fri Jun 12 16:40:05 2015 -0400
@@ -167,6 +167,13 @@
 
     private synchronized static void fixupFunctionTable() {
         installed = false;
+        if (new FunctionTable().functionAvailable("here")) {
+            if (log.isLoggable(java.util.logging.Level.FINE)) {
+                log.log(java.util.logging.Level.FINE, "Here function already registered");
+            }
+            installed = true;
+            return;
+        }
         if (log.isLoggable(java.util.logging.Level.FINE)) {
             log.log(java.util.logging.Level.FINE, "Registering Here function");
         }