Merge

jaxp/.hgtags

@@ -372,3 +372,4 @@ e04a15153cc293f05fcd60bc98236f50e16af46a jdk-9+124
 bdc3c0b737efbf899709eb3121ce760dcfb51151 jdk-9+127
 8a7681a9d70640ac7fbf05c28f53c1d51d8d00a1 jdk-9+128
 74241304e87b0d463391a8ecab40979b5af86dc2 jdk-9+129
+e66cdc2de6b02443911d386fc9217b0d824d0686 jdk-9+130

jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -93,14 +93,14 @@ public abstract class XPathFactory {
     public static XPathFactory newInstance() {
 
         try {
-                return newInstance(DEFAULT_OBJECT_MODEL_URI);
-        } catch (XPathFactoryConfigurationException xpathFactoryConfigurationException) {
-                throw new RuntimeException(
-                        "XPathFactory#newInstance() failed to create an XPathFactory for the default object model: "
-                        + DEFAULT_OBJECT_MODEL_URI
-                        + " with the XPathFactoryConfigurationException: "
-                        + xpathFactoryConfigurationException.toString()
-                );
+            return newInstance(DEFAULT_OBJECT_MODEL_URI);
+        } catch (XPathFactoryConfigurationException e) {
+            throw new RuntimeException(
+                    "XPathFactory#newInstance() failed to create an XPathFactory for the default object model: "
+                    + DEFAULT_OBJECT_MODEL_URI
+                    + " with the XPathFactoryConfigurationException: "
+                    + e.getMessage(), e
+            );
         }
     }