# HG changeset patch
# User mfang
# Date 1381249492 25200
# Node ID 1c074a0c2b9709491a6a1be6751acc9b52c6e293
# Parent dbecbb6855032dcfc9a75db2051b1d2f1319d42e# Parent f031b2fe21cd46c2ebbcd4388b9099fca34ddc99
Merge
diff -r dbecbb685503 -r 1c074a0c2b97 .hgtags
--- a/.hgtags Tue Oct 08 09:22:29 2013 -0700
+++ b/.hgtags Tue Oct 08 09:24:52 2013 -0700
@@ -228,3 +228,6 @@
a22fe9bd01e6c7e7ddc7995dfc9471711692b8d1 jdk8-b104
09a46ec11f880154886c70be03aff5ab2ddf0ab7 jdk8-b105
d3be8e3b429df917e72c1c23e7920c651219b587 jdk8-b106
+d6a32e3831aab20a9a3bc78cdc0a60aaad725c6c jdk8-b107
+8ade3eed63da87067a7137c111f684a821e9e531 jdk8-b108
+02bfab2aa93899e0f02584f1e85537485a196553 jdk8-b109
diff -r dbecbb685503 -r 1c074a0c2b97 make/jprt.properties
--- a/make/jprt.properties Tue Oct 08 09:22:29 2013 -0700
+++ b/make/jprt.properties Tue Oct 08 09:24:52 2013 -0700
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2013, 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
@@ -39,8 +39,8 @@
solaris_x64_5.10-{product|fastdebug}, \
linux_i586_2.6-{product|fastdebug}, \
linux_x64_2.6-{product|fastdebug}, \
- windows_i586_5.1-{product|fastdebug}, \
- windows_x64_5.2-{product|fastdebug}
+ windows_i586_6.1-{product|fastdebug}, \
+ windows_x64_6.1-{product|fastdebug}
# Directories to be excluded from the source bundles
jprt.bundle.exclude.src.dirs=build dist webrev
diff -r dbecbb685503 -r 1c074a0c2b97 src/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIterNodeList.java
--- a/src/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIterNodeList.java Tue Oct 08 09:22:29 2013 -0700
+++ b/src/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIterNodeList.java Tue Oct 08 09:24:52 2013 -0700
@@ -105,15 +105,15 @@
*/
public Node item(int index) {
if (m_iter != null) {
- int node;
+ int node = 0;
int count = m_cachedNodes.size();
if (count > index) {
node = m_cachedNodes.elementAt(index);
return m_dtm.getNode(node);
} else if (m_last == -1) {
- while (((node = m_iter.next()) != DTMAxisIterator.END)
- && count <= index) {
+ while (count <= index
+ && ((node = m_iter.next()) != DTMAxisIterator.END)) {
m_cachedNodes.addElement(node);
count++;
}
diff -r dbecbb685503 -r 1c074a0c2b97 src/javax/xml/datatype/DatatypeFactory.java
--- a/src/javax/xml/datatype/DatatypeFactory.java Tue Oct 08 09:22:29 2013 -0700
+++ b/src/javax/xml/datatype/DatatypeFactory.java Tue Oct 08 09:24:52 2013 -0700
@@ -49,7 +49,13 @@
*
*
* Uses the service-provider loading facilities, defined by the {@link java.util.ServiceLoader} class, to attempt
- * to locate and load an implementation of the service.
+ * to locate and load an implementation of the service using the {@linkplain
+ * java.util.ServiceLoader#load(java.lang.Class) default loading mechanism}:
+ * the service-provider loading facility will use the {@linkplain
+ * java.lang.Thread#getContextClassLoader() current thread's context class loader}
+ * to attempt to load the service. If the context class
+ * loader is null, the {@linkplain
+ * ClassLoader#getSystemClassLoader() system class loader} will be used.
*
* In case of {@link java.util.ServiceConfigurationError service
* configuration error} a {@link javax.xml.datatype.DatatypeConfigurationException}
diff -r dbecbb685503 -r 1c074a0c2b97 src/javax/xml/parsers/DocumentBuilderFactory.java
--- a/src/javax/xml/parsers/DocumentBuilderFactory.java Tue Oct 08 09:22:29 2013 -0700
+++ b/src/javax/xml/parsers/DocumentBuilderFactory.java Tue Oct 08 09:24:52 2013 -0700
@@ -82,7 +82,13 @@
*
* Uses the service-provider loading facilities, defined by the
* {@link java.util.ServiceLoader} class, to attempt to locate and load an
- * implementation of the service.
+ * implementation of the service using the {@linkplain
+ * java.util.ServiceLoader#load(java.lang.Class) default loading mechanism}:
+ * the service-provider loading facility will use the {@linkplain
+ * java.lang.Thread#getContextClassLoader() current thread's context class loader}
+ * to attempt to load the service. If the context class
+ * loader is null, the {@linkplain
+ * ClassLoader#getSystemClassLoader() system class loader} will be used.
*
*
* Otherwise, the system-default implementation is returned.
diff -r dbecbb685503 -r 1c074a0c2b97 src/javax/xml/parsers/SAXParserFactory.java
--- a/src/javax/xml/parsers/SAXParserFactory.java Tue Oct 08 09:22:29 2013 -0700
+++ b/src/javax/xml/parsers/SAXParserFactory.java Tue Oct 08 09:24:52 2013 -0700
@@ -86,7 +86,13 @@
*
* Use the service-provider loading facilities, defined by the
* {@link java.util.ServiceLoader} class, to attempt to locate and load an
- * implementation of the service.
+ * implementation of the service using the {@linkplain
+ * java.util.ServiceLoader#load(java.lang.Class) default loading mechanism}:
+ * the service-provider loading facility will use the {@linkplain
+ * java.lang.Thread#getContextClassLoader() current thread's context class loader}
+ * to attempt to load the service. If the context class
+ * loader is null, the {@linkplain
+ * ClassLoader#getSystemClassLoader() system class loader} will be used.
*
*
* Otherwise the system-default implementation is returned.
diff -r dbecbb685503 -r 1c074a0c2b97 src/javax/xml/stream/XMLEventFactory.java
--- a/src/javax/xml/stream/XMLEventFactory.java Tue Oct 08 09:22:29 2013 -0700
+++ b/src/javax/xml/stream/XMLEventFactory.java Tue Oct 08 09:24:52 2013 -0700
@@ -84,7 +84,13 @@
*
* Use the service-provider loading facilities, defined by the
* {@link java.util.ServiceLoader} class, to attempt to locate and load an
- * implementation of the service.
+ * implementation of the service using the {@linkplain
+ * java.util.ServiceLoader#load(java.lang.Class) default loading mechanism}:
+ * the service-provider loading facility will use the {@linkplain
+ * java.lang.Thread#getContextClassLoader() current thread's context class loader}
+ * to attempt to load the service. If the context class
+ * loader is null, the {@linkplain
+ * ClassLoader#getSystemClassLoader() system class loader} will be used.
*
*
* Otherwise, the system-default implementation is returned.
@@ -152,7 +158,13 @@
* If {@code factoryId} is "javax.xml.stream.XMLEventFactory",
* use the service-provider loading facilities, defined by the
* {@link java.util.ServiceLoader} class, to attempt to locate and load an
- * implementation of the service.
+ * implementation of the service using the {@linkplain
+ * java.util.ServiceLoader#load(java.lang.Class) default loading mechanism}:
+ * the service-provider loading facility will use the {@linkplain
+ * java.lang.Thread#getContextClassLoader() current thread's context class loader}
+ * to attempt to load the service. If the context class
+ * loader is null, the {@linkplain
+ * ClassLoader#getSystemClassLoader() system class loader} will be used.
*
*
* Otherwise, throws a {@link FactoryConfigurationError}.
diff -r dbecbb685503 -r 1c074a0c2b97 src/javax/xml/stream/XMLInputFactory.java
--- a/src/javax/xml/stream/XMLInputFactory.java Tue Oct 08 09:22:29 2013 -0700
+++ b/src/javax/xml/stream/XMLInputFactory.java Tue Oct 08 09:24:52 2013 -0700
@@ -174,7 +174,13 @@
*
* Use the service-provider loading facilities, defined by the
* {@link java.util.ServiceLoader} class, to attempt to locate and load an
- * implementation of the service.
+ * implementation of the service using the {@linkplain
+ * java.util.ServiceLoader#load(java.lang.Class) default loading mechanism}:
+ * the service-provider loading facility will use the {@linkplain
+ * java.lang.Thread#getContextClassLoader() current thread's context class loader}
+ * to attempt to load the service. If the context class
+ * loader is null, the {@linkplain
+ * ClassLoader#getSystemClassLoader() system class loader} will be used.
*
*
* Otherwise, the system-default implementation is returned.
@@ -242,7 +248,13 @@
* If {@code factoryId} is "javax.xml.stream.XMLInputFactory",
* use the service-provider loading facilities, defined by the
* {@link java.util.ServiceLoader} class, to attempt to locate and load an
- * implementation of the service.
+ * implementation of the service using the {@linkplain
+ * java.util.ServiceLoader#load(java.lang.Class) default loading mechanism}:
+ * the service-provider loading facility will use the {@linkplain
+ * java.lang.Thread#getContextClassLoader() current thread's context class loader}
+ * to attempt to load the service. If the context class
+ * loader is null, the {@linkplain
+ * ClassLoader#getSystemClassLoader() system class loader} will be used.
*
*
* Otherwise, throws a {@link FactoryConfigurationError}.
diff -r dbecbb685503 -r 1c074a0c2b97 src/javax/xml/stream/XMLOutputFactory.java
--- a/src/javax/xml/stream/XMLOutputFactory.java Tue Oct 08 09:22:29 2013 -0700
+++ b/src/javax/xml/stream/XMLOutputFactory.java Tue Oct 08 09:24:52 2013 -0700
@@ -150,7 +150,13 @@
*
* Use the service-provider loading facilities, defined by the
* {@link java.util.ServiceLoader} class, to attempt to locate and load an
- * implementation of the service.
+ * implementation of the service using the {@linkplain
+ * java.util.ServiceLoader#load(java.lang.Class) default loading mechanism}:
+ * the service-provider loading facility will use the {@linkplain
+ * java.lang.Thread#getContextClassLoader() current thread's context class loader}
+ * to attempt to load the service. If the context class
+ * loader is null, the {@linkplain
+ * ClassLoader#getSystemClassLoader() system class loader} will be used.
*
*
* Otherwise, the system-default implementation is returned.
@@ -216,7 +222,13 @@
* If {@code factoryId} is "javax.xml.stream.XMLOutputFactory",
* use the service-provider loading facilities, defined by the
* {@link java.util.ServiceLoader} class, to attempt to locate and load an
- * implementation of the service.
+ * implementation of the service using the {@linkplain
+ * java.util.ServiceLoader#load(java.lang.Class) default loading mechanism}:
+ * the service-provider loading facility will use the {@linkplain
+ * java.lang.Thread#getContextClassLoader() current thread's context class loader}
+ * to attempt to load the service. If the context class
+ * loader is null, the {@linkplain
+ * ClassLoader#getSystemClassLoader() system class loader} will be used.
*
*
* Otherwise, throws a {@link FactoryConfigurationError}.
diff -r dbecbb685503 -r 1c074a0c2b97 src/javax/xml/transform/TransformerFactory.java
--- a/src/javax/xml/transform/TransformerFactory.java Tue Oct 08 09:22:29 2013 -0700
+++ b/src/javax/xml/transform/TransformerFactory.java Tue Oct 08 09:24:52 2013 -0700
@@ -77,7 +77,13 @@
*
* Use the service-provider loading facilities, defined by the
* {@link java.util.ServiceLoader} class, to attempt to locate and load an
- * implementation of the service.
+ * implementation of the service using the {@linkplain
+ * java.util.ServiceLoader#load(java.lang.Class) default loading mechanism}:
+ * the service-provider loading facility will use the {@linkplain
+ * java.lang.Thread#getContextClassLoader() current thread's context class loader}
+ * to attempt to load the service. If the context class
+ * loader is null, the {@linkplain
+ * ClassLoader#getSystemClassLoader() system class loader} will be used.
*
*
* Otherwise, the system-default implementation is returned.
diff -r dbecbb685503 -r 1c074a0c2b97 src/javax/xml/validation/SchemaFactory.java
--- a/src/javax/xml/validation/SchemaFactory.java Tue Oct 08 09:22:29 2013 -0700
+++ b/src/javax/xml/validation/SchemaFactory.java Tue Oct 08 09:24:52 2013 -0700
@@ -148,7 +148,14 @@
*
* Use the service-provider loading facilities, defined by the
* {@link java.util.ServiceLoader} class, to attempt to locate and load an
- * implementation of the service.
+ * implementation of the service using the {@linkplain
+ * java.util.ServiceLoader#load(java.lang.Class) default loading mechanism}:
+ * the service-provider loading facility will use the {@linkplain
+ * java.lang.Thread#getContextClassLoader() current thread's context class loader}
+ * to attempt to load the service. If the context class
+ * loader is null, the {@linkplain
+ * ClassLoader#getSystemClassLoader() system class loader} will be used.
+ *
* Each potential service provider is required to implement the method
* {@link #isSchemaLanguageSupported(String schemaLanguage)}.
*
diff -r dbecbb685503 -r 1c074a0c2b97 src/javax/xml/xpath/XPathFactory.java
--- a/src/javax/xml/xpath/XPathFactory.java Tue Oct 08 09:22:29 2013 -0700
+++ b/src/javax/xml/xpath/XPathFactory.java Tue Oct 08 09:24:52 2013 -0700
@@ -123,7 +123,13 @@
*
* Use the service-provider loading facilities, defined by the
* {@link java.util.ServiceLoader} class, to attempt to locate and load an
- * implementation of the service.
+ * implementation of the service using the {@linkplain
+ * java.util.ServiceLoader#load(java.lang.Class) default loading mechanism}:
+ * the service-provider loading facility will use the {@linkplain
+ * java.lang.Thread#getContextClassLoader() current thread's context class loader}
+ * to attempt to load the service. If the context class
+ * loader is null, the {@linkplain
+ * ClassLoader#getSystemClassLoader() system class loader} will be used.
*
* Each potential service provider is required to implement the method
* {@link #isObjectModelSupported(String objectModel)}.