--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/XPathParser.java	Fri Jul 07 03:13:49 2017 +0000
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/XPathParser.java	Mon Jul 10 10:22:36 2017 -0700
@@ -1,6 +1,5 @@
 /*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -667,8 +666,7 @@
   {
 
     int tok;
-
-    Object id;
+    Integer id;
 
     try
     {
@@ -676,7 +674,7 @@
       // a FilterExpr.
       id = Keywords.lookupNodeTest(key);
       if (null == id) id = m_functionTable.getFunctionID(key);
-      tok = ((Integer) id).intValue();
+      tok = id;
     }
     catch (NullPointerException npe)
     {