--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/FunctionTable.java	Tue Mar 15 13:48:24 2016 -0700
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/FunctionTable.java	Thu Mar 17 19:04:05 2016 +0000
@@ -24,7 +24,6 @@
  */
 package com.sun.org.apache.xpath.internal.compiler;
 
-import com.sun.org.apache.xpath.internal.Expression;
 import com.sun.org.apache.xpath.internal.functions.Function;
 import java.util.HashMap;
 import javax.xml.transform.TransformerException;
@@ -341,11 +340,12 @@
           throws javax.xml.transform.TransformerException
   {
           try{
-              if (which < NUM_BUILT_IN_FUNCS)
+              if (which < NUM_BUILT_IN_FUNCS) {
                   return (Function) m_functions[which].newInstance();
-              else
-                  return (Function) m_functions_customer[
-                      which-NUM_BUILT_IN_FUNCS].newInstance();
+              } else {
+                  Class<?> c =  m_functions_customer[which-NUM_BUILT_IN_FUNCS];
+                  return (Function) c.newInstance();
+              }
           }catch (IllegalAccessException ex){
                   throw new TransformerException(ex.getMessage());
           }catch (InstantiationException ex){