changeset 2962:4b637d890b6c

Merge
author michaelm
date Tue, 28 Sep 2010 12:04:09 +0100
parents b3a4add96d45 7b2b0131fa61
children a43232b264cb
files
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/java/sql/Statement.java	Tue Sep 28 11:59:57 2010 +0100
+++ b/src/share/classes/java/sql/Statement.java	Tue Sep 28 12:04:09 2010 +0100
@@ -1051,9 +1051,9 @@
 
     /**
      * Returns a value indicating whether this {@code Statement} will be
-     * closed when all dependent objects such as resultsets are closed.
+     * closed when all its dependent result sets are closed.
      * @return {@code true} if the {@code Statement} will be closed when all
-     * of its dependent objects are closed; {@code false} otherwise
+     * of its dependent result sets are closed; {@code false} otherwise
      * @throws SQLException if this method is called on a closed
      * {@code Statement}
      * @since 1.7
--- a/src/share/classes/javax/sql/rowset/RowSetProvider.java	Tue Sep 28 11:59:57 2010 +0100
+++ b/src/share/classes/javax/sql/rowset/RowSetProvider.java	Tue Sep 28 12:04:09 2010 +0100
@@ -88,8 +88,8 @@
      * </li>
      * </ul>
      * <li>
-     * The ServiceLocator API. The ServiceLocator API will look
-     * for a classname in the file
+     * The {@link ServiceLoader} API. The {@code ServiceLoader} API will look
+     * for a class name in the file
      * {@code META-INF/services/javax.sql.rowset.RowSetFactory}
      * in jars available to the runtime. For example, to have the the RowSetFactory
      * implementation {@code com.sun.rowset.RowSetFactoryImpl } loaded, the