changeset 23590:ffd8b0b70511

8038493: Tidy warnings cleanup for java.sql Reviewed-by: lancea, chegar Contributed-by: Alexander Stepanov <alexander.v.stepanov@oracle.com>
author yan
date Fri, 28 Mar 2014 15:56:24 +0400
parents 05e692d15fcd
children 1b50db37efd3 35b16ae6b4f4
files jdk/src/share/classes/java/sql/Array.java jdk/src/share/classes/java/sql/BatchUpdateException.java jdk/src/share/classes/java/sql/Blob.java jdk/src/share/classes/java/sql/CallableStatement.java jdk/src/share/classes/java/sql/Clob.java jdk/src/share/classes/java/sql/Connection.java jdk/src/share/classes/java/sql/DataTruncation.java jdk/src/share/classes/java/sql/DatabaseMetaData.java jdk/src/share/classes/java/sql/Date.java jdk/src/share/classes/java/sql/JDBCType.java jdk/src/share/classes/java/sql/PreparedStatement.java jdk/src/share/classes/java/sql/ResultSet.java jdk/src/share/classes/java/sql/SQLClientInfoException.java jdk/src/share/classes/java/sql/SQLDataException.java jdk/src/share/classes/java/sql/SQLException.java jdk/src/share/classes/java/sql/SQLFeatureNotSupportedException.java jdk/src/share/classes/java/sql/SQLIntegrityConstraintViolationException.java jdk/src/share/classes/java/sql/SQLInvalidAuthorizationSpecException.java jdk/src/share/classes/java/sql/SQLNonTransientConnectionException.java jdk/src/share/classes/java/sql/SQLNonTransientException.java jdk/src/share/classes/java/sql/SQLPermission.java jdk/src/share/classes/java/sql/SQLRecoverableException.java jdk/src/share/classes/java/sql/SQLSyntaxErrorException.java jdk/src/share/classes/java/sql/SQLTimeoutException.java jdk/src/share/classes/java/sql/SQLTransactionRollbackException.java jdk/src/share/classes/java/sql/SQLTransientConnectionException.java jdk/src/share/classes/java/sql/SQLTransientException.java jdk/src/share/classes/java/sql/SQLWarning.java jdk/src/share/classes/java/sql/Statement.java jdk/src/share/classes/java/sql/Timestamp.java jdk/src/share/classes/java/sql/package.html
diffstat 31 files changed, 199 insertions(+), 230 deletions(-) [+]
line wrap: on
line diff
--- a/jdk/src/share/classes/java/sql/Array.java	Fri Mar 28 11:57:02 2014 +0100
+++ b/jdk/src/share/classes/java/sql/Array.java	Fri Mar 28 15:56:24 2014 +0400
@@ -348,12 +348,11 @@
      * This method frees the <code>Array</code> object and releases the resources that
      * it holds. The object is invalid once the <code>free</code>
      * method is called.
-     *<p>
+     * <p>
      * After <code>free</code> has been called, any attempt to invoke a
      * method other than <code>free</code> will result in a <code>SQLException</code>
      * being thrown.  If <code>free</code> is called multiple times, the subsequent
      * calls to <code>free</code> are treated as a no-op.
-     *<p>
      *
      * @throws SQLException if an error occurs releasing
      * the Array's resources
--- a/jdk/src/share/classes/java/sql/BatchUpdateException.java	Fri Mar 28 11:57:02 2014 +0100
+++ b/jdk/src/share/classes/java/sql/BatchUpdateException.java	Fri Mar 28 15:56:24 2014 +0400
@@ -203,7 +203,6 @@
    * The <code>cause</code> is not initialized, and may subsequently be
    * initialized by a call to the
    * {@link Throwable#initCause(java.lang.Throwable)} method.
-   * <p>
    *
    * @since 1.2
    * @see #BatchUpdateException(java.lang.String, java.lang.String, int, long[],
@@ -378,7 +377,7 @@
    * there are commands in the batch; otherwise, it will contain an
    * update count for each command that executed successfully before
    * the <code>BatchUpdateException</code> was thrown.
-   *<P>
+   * <P>
    * The possible return values for this method were modified for
    * the Java 2 SDK, Standard Edition, version 1.3.  This was done to
    * accommodate the new option of continuing to process commands
@@ -410,7 +409,7 @@
    * <p>
    * This constructor should be used when the returned update count may exceed
    * {@link Integer#MAX_VALUE}.
-   * <p>
+   *
    * @param reason a description of the error
    * @param SQLState an XOPEN or SQL:2003 code identifying the exception
    * @param vendorCode an exception code used by a particular
@@ -448,7 +447,7 @@
    * <p>
    * This method should be used when {@code Statement.executeLargeBatch} is
    * invoked and the returned update count may exceed {@link Integer#MAX_VALUE}.
-   * <p>
+   *
    * @return an array of <code>long</code> containing the update counts
    * for the updates that were executed successfully before this error
    * occurred.  Or, if the driver continues to process commands after an
--- a/jdk/src/share/classes/java/sql/Blob.java	Fri Mar 28 11:57:02 2014 +0100
+++ b/jdk/src/share/classes/java/sql/Blob.java	Fri Mar 28 15:56:24 2014 +0400
@@ -269,12 +269,11 @@
      * This method frees the <code>Blob</code> object and releases the resources that
      * it holds. The object is invalid once the <code>free</code>
      * method is called.
-     *<p>
+     * <p>
      * After <code>free</code> has been called, any attempt to invoke a
      * method other than <code>free</code> will result in a <code>SQLException</code>
      * being thrown.  If <code>free</code> is called multiple times, the subsequent
      * calls to <code>free</code> are treated as a no-op.
-     *<p>
      *
      * @throws SQLException if an error occurs releasing
      * the Blob's resources
--- a/jdk/src/share/classes/java/sql/CallableStatement.java	Fri Mar 28 11:57:02 2014 +0100
+++ b/jdk/src/share/classes/java/sql/CallableStatement.java	Fri Mar 28 15:56:24 2014 +0400
@@ -1160,13 +1160,13 @@
      * <P>
      * This method throws an exception if there is an ambiguity, for example, if the
      * object is of a class implementing more than one of the interfaces named above.
-     *<p>
+     * <p>
      *<b>Note:</b> Not all databases allow for a non-typed Null to be sent to
      * the backend. For maximum portability, the <code>setNull</code> or the
      * <code>setObject(String parameterName, Object x, int sqlType)</code>
      * method should be used
      * instead of <code>setObject(String parameterName, Object x)</code>.
-     *<p>
+     *
      * @param parameterName the name of the parameter
      * @param x the object containing the input parameter value
      * @exception SQLException if parameterName does not correspond to a named
@@ -2025,7 +2025,7 @@
      * <code>NVARCHAR</code>
      * or <code>LONGNVARCHAR</code> parameter as
      * a <code>String</code> in the Java programming language.
-     *  <p>
+     * <p>
      * For the fixed-length type JDBC <code>NCHAR</code>,
      * the <code>String</code> object
      * returned has exactly the same value the SQL
--- a/jdk/src/share/classes/java/sql/Clob.java	Fri Mar 28 11:57:02 2014 +0100
+++ b/jdk/src/share/classes/java/sql/Clob.java	Fri Mar 28 15:56:24 2014 +0400
@@ -317,7 +317,7 @@
      * method other than <code>free</code> will result in a <code>SQLException</code>
      * being thrown.  If <code>free</code> is called multiple times, the subsequent
      * calls to <code>free</code> are treated as a no-op.
-     * <p>
+     *
      * @throws SQLException if an error occurs releasing
      * the Clob's resources
      *
--- a/jdk/src/share/classes/java/sql/Connection.java	Fri Mar 28 11:57:02 2014 +0100
+++ b/jdk/src/share/classes/java/sql/Connection.java	Fri Mar 28 15:56:24 2014 +0400
@@ -273,7 +273,6 @@
      * commits or rolls back an active transaction prior to calling the
      * <code>close</code> method.  If the <code>close</code> method is called
      * and there is an active transaction, the results are implementation-defined.
-     * <P>
      *
      * @exception SQLException SQLException if a database access error occurs
      */
@@ -632,7 +631,7 @@
      * Installs the given <code>TypeMap</code> object as the type map for
      * this <code>Connection</code> object.  The type map will be used for the
      * custom mapping of SQL structured types and distinct types.
-     *<p>
+     * <p>
      * You must set the the values for the <code>TypeMap</code> prior to
      * callng <code>setMap</code> as a JDBC driver may create an internal copy
      * of the <code>TypeMap</code>:
@@ -1114,7 +1113,7 @@
          *                                              completes, this method returns false.  A value of
          *                                              0 indicates a timeout is not applied to the
          *                                              database operation.
-         * <p>
+         *
          * @return true if the connection is valid, false otherwise
          * @exception SQLException if the value supplied for <code>timeout</code>
          * is less then 0
@@ -1165,16 +1164,16 @@
          * <li>ClientHostname   -       The hostname of the computer the application
          *                                                      using the connection is running on.</li>
          * </ul>
-         * <p>
+         *
          * @param name          The name of the client info property to set
          * @param value         The value to set the client info property to.  If the
          *                                      value is null, the current value of the specified
          *                                      property is cleared.
-         * <p>
+         *
          * @throws      SQLClientInfoException if the database server returns an error while
          *                      setting the client info value on the database server or this method
          * is called on a closed connection
-         * <p>
+         *
          * @since 1.6
          */
          void setClientInfo(String name, String value)
@@ -1198,13 +1197,13 @@
      * some databases do not allow multiple client info properties to be set
      * atomically.  For those databases, one or more properties may have been
      * set before the error occurred.
-     * <p>
+     *
      *
      * @param properties                the list of client info properties to set
-     * <p>
+     *
      * @see java.sql.Connection#setClientInfo(String, String) setClientInfo(String, String)
      * @since 1.6
-     * <p>
+     *
      * @throws SQLClientInfoException if the database server returns an error while
      *                  setting the clientInfo values on the database server or this method
      * is called on a closed connection
@@ -1222,15 +1221,15 @@
          * <p>
          * Applications may use the <code>DatabaseMetaData.getClientInfoProperties</code>
          * method to determine the client info properties supported by the driver.
-         * <p>
+         *
          * @param name          The name of the client info property to retrieve
-         * <p>
+         *
          * @return                      The value of the client info property specified
-         * <p>
+         *
          * @throws SQLException         if the database server returns an error when
-         *                                                      fetching the client info value from the database
-         *or this method is called on a closed connection
-         * <p>
+         *                              fetching the client info value from the database
+         *                              or this method is called on a closed connection
+         *
          * @since 1.6
          *
          * @see java.sql.DatabaseMetaData#getClientInfoProperties
@@ -1243,14 +1242,14 @@
          * property supported by the driver.  The value of a client info property
          * may be null if the property has not been set and does not have a
          * default value.
-         * <p>
+         *
          * @return      A <code>Properties</code> object that contains the name and current value of
          *                      each of the client info properties supported by the driver.
-         * <p>
+         *
          * @throws      SQLException if the database server returns an error when
          *                      fetching the client info values from the database
          * or this method is called on a closed connection
-         * <p>
+         *
          * @since 1.6
          */
          Properties getClientInfo()
@@ -1294,7 +1293,7 @@
   * <code>Struct.getSQLTypeName</code>.
 
   * @param attributes the attributes that populate the returned object
-  *  @return a Struct object that maps to the given SQL type and is populated with the given attributes
+  * @return a Struct object that maps to the given SQL type and is populated with the given attributes
   * @throws SQLException if a database error occurs, the typeName is null or this method is called on a closed connection
   * @throws SQLFeatureNotSupportedException  if the JDBC driver does not support this data type
   * @since 1.6
@@ -1426,7 +1425,7 @@
      * problems, the connection will be marked as closed, any resources held by
      * the connection will be released and both the connection and
      * statement will be unusable.
-     *<p>
+     * <p>
      * When the driver determines that the {@code setNetworkTimeout} timeout
      * value has expired, the JDBC driver marks the connection
      * closed and releases any resources held by the connection.
--- a/jdk/src/share/classes/java/sql/DataTruncation.java	Fri Mar 28 11:57:02 2014 +0100
+++ b/jdk/src/share/classes/java/sql/DataTruncation.java	Fri Mar 28 15:56:24 2014 +0400
@@ -49,7 +49,6 @@
      * The <code>cause</code> is not initialized, and may subsequently be
      * initialized by a call to the
      * {@link Throwable#initCause(java.lang.Throwable)} method.
-     * <p>
      *
      * @param index The index of the parameter or column value
      * @param parameter true if a parameter value was truncated
@@ -77,7 +76,6 @@
      * the reason set to "Data truncation", the
      * vendor code set to 0, and
      * the other fields set to the given values.
-     * <p>
      *
      * @param index The index of the parameter or column value
      * @param parameter true if a parameter value was truncated
--- a/jdk/src/share/classes/java/sql/DatabaseMetaData.java	Fri Mar 28 11:57:02 2014 +0100
+++ b/jdk/src/share/classes/java/sql/DatabaseMetaData.java	Fri Mar 28 15:56:24 2014 +0400
@@ -1417,7 +1417,7 @@
      * A possible value for the column
      * <code>COLUMN_TYPE</code>
      * in the <code>ResultSet</code>
-    * returned by the method <code>getProcedureColumns</code>.
+     * returned by the method <code>getProcedureColumns</code>.
      */
     int procedureColumnOut = 4;
     /**
@@ -2367,7 +2367,6 @@
      * <P>If SQL distinct or structured types are supported, then information on the
      * individual types may be obtained from the getUDTs() method.
      *
-
      *
      * <P>Each type description has the following columns:
      *  <OL>
@@ -2377,7 +2376,7 @@
      *  <LI><B>LITERAL_PREFIX</B> String {@code =>} prefix used to quote a literal
      *      (may be <code>null</code>)
      *  <LI><B>LITERAL_SUFFIX</B> String {@code =>} suffix used to quote a literal
-     (may be <code>null</code>)
+     *  (may be <code>null</code>)
      *  <LI><B>CREATE_PARAMS</B> String {@code =>} parameters used in creating
      *      the type (may be <code>null</code>)
      *  <LI><B>NULLABLE</B> short {@code =>} can you use NULL for this type.
@@ -2821,7 +2820,7 @@
 
     /**
      * Retrieves the connection that produced this metadata object.
-     * <P>
+     *
      * @return the connection that produced this metadata object
      * @exception SQLException if a database access error occurs
      * @since 1.2
@@ -2870,9 +2869,9 @@
      *
      * @return <code>true</code> if auto-generated keys can be retrieved
      *         after a statement has executed; <code>false</code> otherwise
-     *<p>If <code>true</code> is returned, the JDBC driver must support the
+     * <p>If <code>true</code> is returned, the JDBC driver must support the
      * returning of auto-generated keys for at least SQL INSERT statements
-     *<p>
+     *
      * @exception SQLException if a database access error occurs
      * @since 1.4
      */
@@ -3138,7 +3137,7 @@
      * whether the value returned by the method
      * <code>SQLException.getSQLState</code> is an
      * X/Open (now know as Open Group) SQL CLI SQLSTATE value.
-     * <P>
+     *
      * @since 1.4
      */
     int sqlStateXOpen = 1;
@@ -3148,7 +3147,7 @@
      * <code>DatabaseMetaData.getSQLStateType</code> which is used to indicate
      * whether the value returned by the method
      * <code>SQLException.getSQLState</code> is an SQLSTATE value.
-     * <P>
+     *
      * @since 1.6
      */
     int sqlStateSQL = 2;
@@ -3282,12 +3281,12 @@
          * </ol>
          * <p>
          * The <code>ResultSet</code> is sorted by the NAME column
-         * <p>
+         *
          * @return      A <code>ResultSet</code> object; each row is a supported client info
          * property
-         * <p>
+         *
          *  @exception SQLException if a database access error occurs
-         * <p>
+         *
          * @since 1.6
          */
         ResultSet getClientInfoProperties()
--- a/jdk/src/share/classes/java/sql/Date.java	Fri Mar 28 11:57:02 2014 +0100
+++ b/jdk/src/share/classes/java/sql/Date.java	Fri Mar 28 15:56:24 2014 +0400
@@ -150,7 +150,7 @@
 
     /**
      * Formats a date in the date escape format yyyy-mm-dd.
-     * <P>
+     *
      * @return a String in yyyy-mm-dd format
      */
     @SuppressWarnings("deprecation")
--- a/jdk/src/share/classes/java/sql/JDBCType.java	Fri Mar 28 11:57:02 2014 +0100
+++ b/jdk/src/share/classes/java/sql/JDBCType.java	Fri Mar 28 15:56:24 2014 +0400
@@ -27,7 +27,7 @@
 /**
  * <P>Defines the constants that are used to identify generic
  * SQL types, called JDBC types.
- * <p>
+ *
  * @see SQLType
  * @since 1.8
  */
--- a/jdk/src/share/classes/java/sql/PreparedStatement.java	Fri Mar 28 11:57:02 2014 +0100
+++ b/jdk/src/share/classes/java/sql/PreparedStatement.java	Fri Mar 28 15:56:24 2014 +0400
@@ -892,7 +892,6 @@
       * Sets the designated parameter to the given <code>java.sql.SQLXML</code> object.
       * The driver converts this to an
       * SQL <code>XML</code> value when it sends it to the database.
-      * <p>
       *
       * @param parameterIndex index of the first parameter is 1, the second is 2, ...
       * @param xmlObject a <code>SQLXML</code> object that maps an SQL <code>XML</code> value
--- a/jdk/src/share/classes/java/sql/ResultSet.java	Fri Mar 28 11:57:02 2014 +0100
+++ b/jdk/src/share/classes/java/sql/ResultSet.java	Fri Mar 28 15:56:24 2014 +0400
@@ -1259,7 +1259,6 @@
      * If an input stream is open for the current row, a call to the method
      * <code>previous</code> will implicitly close it.  A <code>ResultSet</code>
      *  object's warning change is cleared when a new row is read.
-     *<p>
      *
      * @return <code>true</code> if the cursor is now positioned on a valid row;
      * <code>false</code> if the cursor is positioned before the first row
@@ -3206,7 +3205,6 @@
      * row. The updater methods do not update the underlying database; instead
      * the <code>updateRow</code> or <code>insertRow</code> methods are called
      * to update the database.
-     * <p>
      *
      * @param columnIndex the first column is 1, the second 2, ...
      * @param xmlObject the value for the column to be updated
@@ -3232,7 +3230,6 @@
      * row. The updater methods do not update the underlying database; instead
      * the <code>updateRow</code> or <code>insertRow</code> methods are called
      * to update the database.
-     * <p>
      *
      * @param columnLabel the label for the column specified with the SQL AS clause.  If the SQL AS clause was not specified, then the label is the name of the column
      * @param xmlObject the column value
--- a/jdk/src/share/classes/java/sql/SQLClientInfoException.java	Fri Mar 28 11:57:02 2014 +0100
+++ b/jdk/src/share/classes/java/sql/SQLClientInfoException.java	Fri Mar 28 15:56:24 2014 +0400
@@ -40,7 +40,7 @@
  * properties are identified by passing a
  * <code>Map&lt;String,ClientInfoStatus&gt;</code> to
  * the appropriate <code>SQLClientInfoException</code> constructor.
- * <p>
+ *
  * @see ClientInfoStatus
  * @see Connection#setClientInfo
  * @since 1.6
@@ -60,7 +60,6 @@
      * The <code>cause</code> is not initialized, and may subsequently be
      * initialized by a call to the
      * {@link Throwable#initCause(java.lang.Throwable)} method.
-     * <p>
      *
      * @since 1.6
      */
@@ -78,7 +77,6 @@
      * The <code>cause</code> is not initialized, and may subsequently be
      * initialized by a call to the
      * {@link Throwable#initCause(java.lang.Throwable)} method.
-     * <p>
      *
      * @param failedProperties          A Map containing the property values that could not
      *                                  be set.  The keys in the Map
@@ -86,7 +84,7 @@
      *                                  properties that could not be set and
      *                                  the values contain one of the reason codes
      *                                  defined in <code>ClientInfoStatus</code>
-     * <p>
+     *
      * @since 1.6
      */
         public SQLClientInfoException(Map<String, ClientInfoStatus> failedProperties) {
@@ -102,8 +100,6 @@
      * <code>cause==null</code> or to <code>cause.toString()</code> if
      * <code>cause!=null</code> and the vendor code is initialized to 0.
      *
-     * <p>
-     *
      * @param failedProperties          A Map containing the property values that could not
      *                                  be set.  The keys in the Map
      *                                  contain the names of the client info
@@ -112,7 +108,7 @@
      *                                  defined in <code>ClientInfoStatus</code>
      * @param cause                                     the (which is saved for later retrieval by the <code>getCause()</code> method); may be null indicating
      *     the cause is non-existent or unknown.
-     * <p>
+     *
      * @since 1.6
      */
         public SQLClientInfoException(Map<String, ClientInfoStatus> failedProperties,
@@ -132,7 +128,6 @@
      * The <code>cause</code> is not initialized, and may subsequently be
      * initialized by a call to the
      * {@link Throwable#initCause(java.lang.Throwable)} method.
-     * <p>
      *
      * @param reason                            a description of the exception
      * @param failedProperties          A Map containing the property values that could not
@@ -141,7 +136,7 @@
      *                                  properties that could not be set and
      *                                  the values contain one of the reason codes
      *                                  defined in <code>ClientInfoStatus</code>
-     * <p>
+     *
      * @since 1.6
      */
         public SQLClientInfoException(String reason,
@@ -157,7 +152,6 @@
      * <code>failedProperties</code>.
      * The  <code>SQLState</code> is initialized
      * to <code>null</code> and the vendor code is initialized to 0.
-     * <p>
      *
      * @param reason                            a description of the exception
      * @param failedProperties          A Map containing the property values that could not
@@ -168,7 +162,7 @@
      *                                  defined in <code>ClientInfoStatus</code>
      * @param cause                                     the underlying reason for this <code>SQLException</code> (which is saved for later retrieval by the <code>getCause()</code> method); may be null indicating
      *     the cause is non-existent or unknown.
-     * <p>
+     *
      * @since 1.6
      */
         public SQLClientInfoException(String reason,
@@ -188,17 +182,16 @@
      * initialized by a call to the
      * {@link Throwable#initCause(java.lang.Throwable)} method. The vendor code
      * is initialized to 0.
-     * <p>
      *
-     * @param reason                            a description of the exception
-     * @param SQLState                          an XOPEN or SQL:2003 code identifying the exception
+     * @param reason                    a description of the exception
+     * @param SQLState                  an XOPEN or SQL:2003 code identifying the exception
      * @param failedProperties          A Map containing the property values that could not
      *                                  be set.  The keys in the Map
      *                                  contain the names of the client info
      *                                  properties that could not be set and
      *                                  the values contain one of the reason codes
      *                                  defined in <code>ClientInfoStatus</code>
-     * <p>
+     *
      * @since 1.6
      */
         public SQLClientInfoException(String reason,
@@ -213,19 +206,18 @@
      * Constructs a <code>SQLClientInfoException</code> object initialized with a
      * given  <code>reason</code>, <code>SQLState</code>, <code>cause</code>
      * and <code>failedProperties</code>.  The vendor code is initialized to 0.
-     * <p>
      *
-     * @param reason                            a description of the exception
-     * @param SQLState                          an XOPEN or SQL:2003 code identifying the exception
+     * @param reason                    a description of the exception
+     * @param SQLState                  an XOPEN or SQL:2003 code identifying the exception
      * @param failedProperties          A Map containing the property values that could not
      *                                  be set.  The keys in the Map
      *                                  contain the names of the client info
      *                                  properties that could not be set and
      *                                  the values contain one of the reason codes
      *                                  defined in <code>ClientInfoStatus</code>
-     * @param cause                                     the underlying reason for this <code>SQLException</code> (which is saved for later retrieval by the <code>getCause()</code> method); may be null indicating
+     * @param cause                     the underlying reason for this <code>SQLException</code> (which is saved for later retrieval by the <code>getCause()</code> method); may be null indicating
      *     the cause is non-existent or unknown.
-     * <p>
+     *
      * @since 1.6
      */
         public SQLClientInfoException(String reason,
@@ -245,18 +237,17 @@
      * The <code>cause</code> is not initialized, and may subsequently be
      * initialized by a call to the
      * {@link Throwable#initCause(java.lang.Throwable)} method.
-     * <p>
      *
-     * @param reason                            a description of the exception
-     * @param SQLState                          an XOPEN or SQL:2003 code identifying the exception
-     * @param vendorCode                        a database vendor-specific exception code
+     * @param reason                    a description of the exception
+     * @param SQLState                  an XOPEN or SQL:2003 code identifying the exception
+     * @param vendorCode                a database vendor-specific exception code
      * @param failedProperties          A Map containing the property values that could not
      *                                  be set.  The keys in the Map
      *                                  contain the names of the client info
      *                                  properties that could not be set and
      *                                  the values contain one of the reason codes
      *                                  defined in <code>ClientInfoStatus</code>
-     * <p>
+     *
      * @since 1.6
      */
         public SQLClientInfoException(String reason,
@@ -273,11 +264,10 @@
      * given  <code>reason</code>, <code>SQLState</code>,
      * <code>cause</code>, <code>vendorCode</code> and
      * <code>failedProperties</code>.
-     * <p>
      *
-     * @param reason                            a description of the exception
-     * @param SQLState                          an XOPEN or SQL:2003 code identifying the exception
-     * @param vendorCode                        a database vendor-specific exception code
+     * @param reason                    a description of the exception
+     * @param SQLState                  an XOPEN or SQL:2003 code identifying the exception
+     * @param vendorCode                a database vendor-specific exception code
      * @param failedProperties          A Map containing the property values that could not
      *                                  be set.  The keys in the Map
      *                                  contain the names of the client info
@@ -285,8 +275,8 @@
      *                                  the values contain one of the reason codes
      *                                  defined in <code>ClientInfoStatus</code>
      * @param cause                     the underlying reason for this <code>SQLException</code> (which is saved for later retrieval by the <code>getCause()</code> method); may be null indicating
-     *     the cause is non-existent or unknown.
-     * <p>
+     *                                  the cause is non-existent or unknown.
+     *
      * @since 1.6
      */
         public SQLClientInfoException(String reason,
@@ -305,11 +295,10 @@
      * keys in the Map  contain the names of the client info
      * properties that could not be set and the values contain one of the
      * reason codes defined in <code>ClientInfoStatus</code>
-     * <p>
      *
      * @return Map list containing the client info properties that could
      * not be set
-     * <p>
+     *
      * @since 1.6
      */
         public Map<String, ClientInfoStatus> getFailedProperties() {
--- a/jdk/src/share/classes/java/sql/SQLDataException.java	Fri Mar 28 11:57:02 2014 +0100
+++ b/jdk/src/share/classes/java/sql/SQLDataException.java	Fri Mar 28 15:56:24 2014 +0400
@@ -45,7 +45,6 @@
          * The <code>cause</code> is not initialized, and may subsequently be
          * initialized by a call to
          * {@link Throwable#initCause(java.lang.Throwable)} method.
-         * <p>
          *
          * @since 1.6
          */
@@ -62,7 +61,6 @@
          * The <code>cause</code> is not initialized, and may subsequently be
          * initialized by a call to
          * {@link Throwable#initCause(java.lang.Throwable)} method.
-         * <p>
          *
          * @param reason a description of the exception
          * @since 1.6
@@ -79,7 +77,7 @@
          * The <code>cause</code> is not initialized, and may subsequently be
          * initialized by a call to
          * {@link Throwable#initCause(java.lang.Throwable)} method.
-         * <p>
+         *
          * @param reason a description of the exception
          * @param SQLState an XOPEN or SQL:2003 code identifying the exception
          * @since 1.6
@@ -96,7 +94,7 @@
          * The <code>cause</code> is not initialized, and may subsequently be
          * initialized by a call to
          * {@link Throwable#initCause(java.lang.Throwable)} method.
-         * <p>
+         *
          * @param reason a description of the exception
          * @param SQLState an XOPEN or SQL:2003 code identifying the exception
          * @param vendorCode a database vendor specific exception code
@@ -114,7 +112,7 @@
      * The <code>reason</code>  is initialized to <code>null</code> if
      * <code>cause==null</code> or to <code>cause.toString()</code> if
      * <code>cause!=null</code>.
-     * <p>
+     *
      * @param cause the underlying reason for this <code>SQLException</code> (which is saved for later retrieval by the <code>getCause()</code> method); may be null indicating
      *     the cause is non-existent or unknown.
      * @since 1.6
@@ -128,7 +126,7 @@
      * <code>reason</code> and  <code>cause</code>.
      * The <code>SQLState</code> is  initialized to <code>null</code>
      * and the vendor code is initialized to 0.
-     * <p>
+     *
      * @param reason a description of the exception.
      * @param cause the underlying reason for this <code>SQLException</code> (which is saved for later retrieval by the <code>getCause()</code> method); may be null indicating
      *     the cause is non-existent or unknown.
@@ -142,7 +140,7 @@
      *  Constructs a <code>SQLDataException</code> object with a given
      * <code>reason</code>, <code>SQLState</code> and  <code>cause</code>.
      * The vendor code is initialized to 0.
-     * <p>
+     *
      * @param reason a description of the exception.
      * @param SQLState an XOPEN or SQL:2003 code identifying the exception
      * @param cause the underlying reason for this <code>SQLException</code> (which is saved for later retrieval by the <code>getCause()</code> method); may be null indicating
@@ -157,7 +155,7 @@
      * Constructs a <code>SQLDataException</code> object with a given
      * <code>reason</code>, <code>SQLState</code>, <code>vendorCode</code>
      * and  <code>cause</code>.
-     * <p>
+     *
      * @param reason a description of the exception
      * @param SQLState an XOPEN or SQL:2003 code identifying the exception
      * @param vendorCode a database vendor-specific exception code
--- a/jdk/src/share/classes/java/sql/SQLException.java	Fri Mar 28 11:57:02 2014 +0100
+++ b/jdk/src/share/classes/java/sql/SQLException.java	Fri Mar 28 15:56:24 2014 +0400
@@ -61,7 +61,7 @@
      * The <code>cause</code> is not initialized, and may subsequently be
      * initialized by a call to the
      * {@link Throwable#initCause(java.lang.Throwable)} method.
-     * <p>
+     *
      * @param reason a description of the exception
      * @param SQLState an XOPEN or SQL:2003 code identifying the exception
      * @param vendorCode a database vendor-specific exception code
@@ -88,7 +88,7 @@
      * initialized by a call to the
      * {@link Throwable#initCause(java.lang.Throwable)} method. The vendor code
      * is initialized to 0.
-     * <p>
+     *
      * @param reason a description of the exception
      * @param SQLState an XOPEN or SQL:2003 code identifying the exception
      */
@@ -112,7 +112,7 @@
      * The <code>cause</code> is not initialized, and may subsequently be
      * initialized by a call to the
      * {@link Throwable#initCause(java.lang.Throwable)} method.
-     * <p>
+     *
      * @param reason a description of the exception
      */
     public SQLException(String reason) {
@@ -155,7 +155,7 @@
      * The <code>reason</code>  is initialized to <code>null</code> if
      * <code>cause==null</code> or to <code>cause.toString()</code> if
      * <code>cause!=null</code>.
-     * <p>
+     *
      * @param cause the underlying reason for this <code>SQLException</code>
      * (which is saved for later retrieval by the <code>getCause()</code> method);
      * may be null indicating the cause is non-existent or unknown.
@@ -176,7 +176,7 @@
      * <code>reason</code> and  <code>cause</code>.
      * The <code>SQLState</code> is  initialized to <code>null</code>
      * and the vendor code is initialized to 0.
-     * <p>
+     *
      * @param reason a description of the exception.
      * @param cause the underlying reason for this <code>SQLException</code>
      * (which is saved for later retrieval by the <code>getCause()</code> method);
@@ -197,7 +197,7 @@
      * Constructs a <code>SQLException</code> object with a given
      * <code>reason</code>, <code>SQLState</code> and  <code>cause</code>.
      * The vendor code is initialized to 0.
-     * <p>
+     *
      * @param reason a description of the exception.
      * @param sqlState an XOPEN or SQL:2003 code identifying the exception
      * @param cause the underlying reason for this <code>SQLException</code>
@@ -223,7 +223,7 @@
      * Constructs a <code>SQLException</code> object with a given
      * <code>reason</code>, <code>SQLState</code>, <code>vendorCode</code>
      * and  <code>cause</code>.
-     * <p>
+     *
      * @param reason a description of the exception
      * @param sqlState an XOPEN or SQL:2003 code identifying the exception
      * @param vendorCode a database vendor-specific exception code
--- a/jdk/src/share/classes/java/sql/SQLFeatureNotSupportedException.java	Fri Mar 28 11:57:02 2014 +0100
+++ b/jdk/src/share/classes/java/sql/SQLFeatureNotSupportedException.java	Fri Mar 28 15:56:24 2014 +0400
@@ -50,7 +50,7 @@
          * The <code>cause</code> is not initialized, and may subsequently be
          * initialized by a call to the
          * {@link Throwable#initCause(java.lang.Throwable)} method.
-         * <p>
+         *
          * @since 1.6
          */
         public SQLFeatureNotSupportedException() {
@@ -66,7 +66,7 @@
          * The <code>cause</code> is not initialized, and may subsequently be
          * initialized by a call to the
          * {@link Throwable#initCause(java.lang.Throwable)} method.
-         * <p>
+         *
          * @param reason a description of the exception
          * @since 1.6
          */
@@ -82,7 +82,7 @@
          * initialized by a call to the
          * {@link Throwable#initCause(java.lang.Throwable)} method. The vendor code
          * is initialized to 0.
-         * <p>
+         *
          * @param reason a description of the exception
          * @param SQLState an XOPEN or SQL:2003 code identifying the exception
          * @since 1.6
@@ -99,7 +99,7 @@
          * The <code>cause</code> is not initialized, and may subsequently be
          * initialized by a call to the
          * {@link Throwable#initCause(java.lang.Throwable)} method.
-         * <p>
+         *
          * @param reason a description of the exception
          * @param SQLState an XOPEN or SQL:2003 code identifying the exception
          * @param vendorCode a database vendor specific exception code
@@ -117,7 +117,7 @@
      * The <code>reason</code>  is initialized to <code>null</code> if
      * <code>cause==null</code> or to <code>cause.toString()</code> if
      * <code>cause!=null</code>.
-     * <p>
+     *
      * @param cause the underlying reason for this <code>SQLException</code> (which is saved for later retrieval by the <code>getCause()</code> method); may be null indicating
      *     the cause is non-existent or unknown.
      * @since 1.6
@@ -132,7 +132,7 @@
      * <code>reason</code> and  <code>cause</code>.
      * The <code>SQLState</code> is  initialized to <code>null</code>
      * and the vendor code is initialized to 0.
-     * <p>
+     *
      * @param reason a description of the exception.
      * @param cause the underlying reason for this <code>SQLException</code> (which is saved for later retrieval by the <code>getCause()</code> method); may be null indicating
      *     the cause is non-existent or unknown.
@@ -147,7 +147,7 @@
      * with a given
      * <code>reason</code>, <code>SQLState</code> and  <code>cause</code>.
      * The vendor code is initialized to 0.
-     * <p>
+     *
      * @param reason a description of the exception.
      * @param SQLState an XOPEN or SQL:2003 code identifying the exception
      * @param cause the (which is saved for later retrieval by the <code>getCause()</code> method); may be null indicating
@@ -163,7 +163,7 @@
      * with a given
      * <code>reason</code>, <code>SQLState</code>, <code>vendorCode</code>
      * and  <code>cause</code>.
-     * <p>
+     *
      * @param reason a description of the exception
      * @param SQLState an XOPEN or SQL:2003 code identifying the exception
      * @param vendorCode a database vendor-specific exception code
--- a/jdk/src/share/classes/java/sql/SQLIntegrityConstraintViolationException.java	Fri Mar 28 11:57:02 2014 +0100
+++ b/jdk/src/share/classes/java/sql/SQLIntegrityConstraintViolationException.java	Fri Mar 28 15:56:24 2014 +0400
@@ -45,7 +45,7 @@
          * The <code>cause</code> is not initialized, and may subsequently be
          * initialized by a call to the
          * {@link Throwable#initCause(java.lang.Throwable)} method.
-         * <p>
+         *
          * @since 1.6
          */
         public SQLIntegrityConstraintViolationException() {
@@ -61,7 +61,7 @@
          * The <code>cause</code> is not initialized, and may subsequently be
          * initialized by a call to the
          * {@link Throwable#initCause(java.lang.Throwable)} method.
-         * <p>
+         *
          * @param reason a description of the exception
          * @since 1.6
          */
@@ -77,7 +77,7 @@
          * initialized by a call to the
          * {@link Throwable#initCause(java.lang.Throwable)} method. The vendor code
          * is initialized to 0.
-         * <p>
+         *
          * @param reason a description of the exception
          * @param SQLState an XOPEN or SQL:2003 code identifying the exception
          * @since 1.6
@@ -94,7 +94,7 @@
          * The <code>cause</code> is not initialized, and may subsequently be
          * initialized by a call to the
          * {@link Throwable#initCause(java.lang.Throwable)} method.
-         * <p>
+         *
          * @param reason a description of the exception
          * @param SQLState an XOPEN or SQL:2003 code identifying the exception
          * @param vendorCode a database vendor specific exception code
@@ -112,11 +112,11 @@
      * The <code>reason</code>  is initialized to <code>null</code> if
      * <code>cause==null</code> or to <code>cause.toString()</code> if
      * <code>cause!=null</code>.
-         * <p>
+     *
      * @param cause the underlying reason for this <code>SQLException</code> (which is saved for later retrieval by the <code>getCause()</code>  method); may be null indicating
      *     the cause is non-existent or unknown.
      * @since 1.6
-         */
+     */
     public SQLIntegrityConstraintViolationException(Throwable cause) {
         super(cause);
     }
@@ -127,7 +127,7 @@
      * <code>reason</code> and  <code>cause</code>.
      * The <code>SQLState</code> is  initialized to <code>null</code>
      * and the vendor code is initialized to 0.
-     * <p>
+     *
      * @param reason a description of the exception.
      * @param cause the (which is saved for later retrieval by the <code>getCause()</code> method); may be null indicating
      *     the cause is non-existent or unknown.
@@ -142,7 +142,7 @@
      *  with a given
      * <code>reason</code>, <code>SQLState</code> and  <code>cause</code>.
      * The vendor code is initialized to 0.
-     * <p>
+     *
      * @param reason a description of the exception.
      * @param SQLState an XOPEN or SQL:2003 code identifying the exception
      * @param cause the underlying reason for this <code>SQLException</code> (which is saved for later retrieval by the <code>getCause()</code>  method); may be null indicating
@@ -158,7 +158,7 @@
      * with a given
      * <code>reason</code>, <code>SQLState</code>, <code>vendorCode</code>
      * and  <code>cause</code>.
-     * <p>
+     *
      * @param reason a description of the exception
      * @param SQLState an XOPEN or SQL:2003 code identifying the exception
      * @param vendorCode a database vendor-specific exception code
--- a/jdk/src/share/classes/java/sql/SQLInvalidAuthorizationSpecException.java	Fri Mar 28 11:57:02 2014 +0100
+++ b/jdk/src/share/classes/java/sql/SQLInvalidAuthorizationSpecException.java	Fri Mar 28 15:56:24 2014 +0400
@@ -45,7 +45,7 @@
          * The <code>cause</code> is not initialized, and may subsequently be
          * initialized by a call to the
          * {@link Throwable#initCause(java.lang.Throwable)} method.
-         * <p>
+         *
          * @since 1.6
          */
         public SQLInvalidAuthorizationSpecException() {
@@ -61,7 +61,7 @@
          * The <code>cause</code> is not initialized, and may subsequently be
          * initialized by a call to the
          * {@link Throwable#initCause(java.lang.Throwable)} method.
-         * <p>
+         *
          * @param reason a description of the exception
          * @since 1.6
          */
@@ -77,7 +77,7 @@
          * initialized by a call to the
          * {@link Throwable#initCause(java.lang.Throwable)} method. The vendor code
          * is initialized to 0.
-         * <p>
+         *
          * @param reason a description of the exception
          * @param SQLState an XOPEN or SQL:2003 code identifying the exception
          * @since 1.6
@@ -94,7 +94,7 @@
          * The <code>cause</code> is not initialized, and may subsequently be
          * initialized by a call to the
          * {@link Throwable#initCause(java.lang.Throwable)} method.
-         * <p>
+         *
          * @param reason a description of the exception
          * @param SQLState an XOPEN or SQL:2003 code identifying the exception
          * @param vendorCode a database vendor specific exception code
@@ -104,19 +104,19 @@
                   super(reason,SQLState,vendorCode);
         }
 
-        /**
+    /**
      * Constructs a <code>SQLInvalidAuthorizationSpecException</code> object
-         * with a given  <code>cause</code>.
+     * with a given  <code>cause</code>.
      * The <code>SQLState</code> is initialized
      * to <code>null</code> and the vendor code is initialized to 0.
      * The <code>reason</code>  is initialized to <code>null</code> if
      * <code>cause==null</code> or to <code>cause.toString()</code> if
      * <code>cause!=null</code>.
-         * <p>
+     *
      * @param cause the underlying reason for this <code>SQLException</code> (which is saved for later retrieval by the <code>getCause()</code> method); may be null indicating
      *     the cause is non-existent or unknown.
      * @since 1.6
-         */
+     */
     public SQLInvalidAuthorizationSpecException(Throwable cause) {
         super(cause);
     }
@@ -127,7 +127,7 @@
      * <code>reason</code> and  <code>cause</code>.
      * The <code>SQLState</code> is  initialized to <code>null</code>
      * and the vendor code is initialized to 0.
-     * <p>
+     *
      * @param reason a description of the exception.
      * @param cause the underlying reason for this <code>SQLException</code> (which is saved for later retrieval by the <code>getCause()</code> method); may be null indicating
      *     the cause is non-existent or unknown.
@@ -142,7 +142,7 @@
      *  with a given
      * <code>reason</code>, <code>SQLState</code> and  <code>cause</code>.
      * The vendor code is initialized to 0.
-     * <p>
+     *
      * @param reason a description of the exception.
      * @param SQLState an XOPEN or SQL:2003 code identifying the exception
      * @param cause the underlying reason for this <code>SQLException</code> (which is saved for later retrieval by the <code>getCause()</code>  method); may be null indicating
@@ -158,7 +158,7 @@
      * with a given
      * <code>reason</code>, <code>SQLState</code>, <code>vendorCode</code>
      * and  <code>cause</code>.
-     * <p>
+     *
      * @param reason a description of the exception
      * @param SQLState an XOPEN or SQL:2003 code identifying the exception
      * @param vendorCode a database vendor-specific exception code
--- a/jdk/src/share/classes/java/sql/SQLNonTransientConnectionException.java	Fri Mar 28 11:57:02 2014 +0100
+++ b/jdk/src/share/classes/java/sql/SQLNonTransientConnectionException.java	Fri Mar 28 15:56:24 2014 +0400
@@ -45,7 +45,6 @@
          * The <code>cause</code> is not initialized, and may subsequently be
          * initialized by a call to the
          * {@link Throwable#initCause(java.lang.Throwable)} method.
-         * <p>
          *
          * @since 1.6
          */
@@ -62,7 +61,7 @@
          * The <code>cause</code> is not initialized, and may subsequently be
          * initialized by a call to the
          * {@link Throwable#initCause(java.lang.Throwable)} method.
-         * <p>
+         *
          * @param reason a description of the exception
          * @since 1.6
          */
@@ -78,7 +77,7 @@
          * initialized by a call to the
          * {@link Throwable#initCause(java.lang.Throwable)} method. The vendor code
          * is initialized to 0.
-         * <p>
+         *
          * @param reason a description of the exception
          * @param SQLState an XOPEN or SQL:2003 code identifying the exception
          * @since 1.6
@@ -95,7 +94,7 @@
          * The <code>cause</code> is not initialized, and may subsequently be
          * initialized by a call to the
          * {@link Throwable#initCause(java.lang.Throwable)} method.
-         * <p>
+         *
          * @param reason a description of the exception
          * @param SQLState an XOPEN or SQL:2003 code identifying the exception
          * @param vendorCode a database vendor specific exception code
@@ -105,15 +104,15 @@
                 super(reason,SQLState,vendorCode);
         }
 
-        /**
+    /**
      * Constructs a <code>SQLNonTransientConnectionException</code> object
-         * with a given  <code>cause</code>.
-           * The <code>SQLState</code> is initialized
+     * with a given  <code>cause</code>.
+     * The <code>SQLState</code> is initialized
      * to <code>null</code> and the vendor code is initialized to 0.
      * The <code>reason</code>  is initialized to <code>null</code> if
      * <code>cause==null</code> or to <code>cause.toString()</code> if
      * <code>cause!=null</code>.
-         * <p>
+     *
      * @param cause the underlying reason for this <code>SQLException</code> (which is saved for later retrieval by the <code>getCause()</code> method); may be null indicating
      *     the cause is non-existent or unknown.
      * @since 1.6
@@ -128,7 +127,7 @@
      * <code>reason</code> and  <code>cause</code>.
      * The <code>SQLState</code> is  initialized to <code>null</code>
      * and the vendor code is initialized to 0.
-     * <p>
+     *
      * @param reason a description of the exception.
      * @param cause the underlying reason for this <code>SQLException</code> (which is saved for later retrieval by the <code>getCause()</code> method); may be null indicating
      *     the cause is non-existent or unknown.
@@ -143,7 +142,7 @@
      * with a given
      * <code>reason</code>, <code>SQLState</code> and  <code>cause</code>.
      * The vendor code is initialized to 0.
-     * <p>
+     *
      * @param reason a description of the exception.
      * @param SQLState an XOPEN or SQL:2003 code identifying the exception
      * @param cause the (which is saved for later retrieval by the <code>getCause()</code> method); may be null indicating
@@ -155,11 +154,11 @@
     }
 
     /**
-     *  Constructs a <code>SQLNonTransientConnectionException</code> object
+     * Constructs a <code>SQLNonTransientConnectionException</code> object
      * with a given
      * <code>reason</code>, <code>SQLState</code>, <code>vendorCode</code>
      * and  <code>cause</code>.
-     * <p>
+     *
      * @param reason a description of the exception
      * @param SQLState an XOPEN or SQL:2003 code identifying the exception
      * @param vendorCode a database vendor-specific exception code
--- a/jdk/src/share/classes/java/sql/SQLNonTransientException.java	Fri Mar 28 11:57:02 2014 +0100
+++ b/jdk/src/share/classes/java/sql/SQLNonTransientException.java	Fri Mar 28 15:56:24 2014 +0400
@@ -29,7 +29,6 @@
  * The subclass of {@link SQLException} thrown when an instance where a retry
  * of the same operation would fail unless the cause of the <code>SQLException</code>
  * is corrected.
- *<p>
  *
  * @since 1.6
  */
@@ -43,7 +42,6 @@
          * The <code>cause</code> is not initialized, and may subsequently be
          * initialized by a call to the
          * {@link Throwable#initCause(java.lang.Throwable)} method.
-         * <p>
          *
          * @since 1.6
          */
@@ -60,7 +58,6 @@
          * The <code>cause</code> is not initialized, and may subsequently be
          * initialized by a call to the
          * {@link Throwable#initCause(java.lang.Throwable)} method.
-         * <p>
          *
          * @param reason a description of the exception
          * @since 1.6
@@ -77,7 +74,7 @@
          * initialized by a call to the
          * {@link Throwable#initCause(java.lang.Throwable)} method. The vendor code
          * is initialized to 0.
-         * <p>
+         *
          * @param reason a description of the exception
          * @param SQLState an XOPEN or SQL:2003 code identifying the exception
          * @since 1.6
@@ -94,7 +91,7 @@
          * The <code>cause</code> is not initialized, and may subsequently be
          * initialized by a call to the
          * {@link Throwable#initCause(java.lang.Throwable)} method.
-         * <p>
+         *
          * @param reason a description of the exception
          * @param SQLState an XOPEN or SQL:2003 code identifying the exception
          * @param vendorCode a database vendor specific exception code
@@ -112,7 +109,7 @@
      * The <code>reason</code>  is initialized to <code>null</code> if
      * <code>cause==null</code> or to <code>cause.toString()</code> if
      * <code>cause!=null</code>.
-     * <p>
+     *
      * @param cause the underlying reason for this <code>SQLException</code> (which is saved for later retrieval by the <code>getCause()</code> method); may be null indicating
      *     the cause is non-existent or unknown.
      * @since 1.6
@@ -127,7 +124,7 @@
      * <code>reason</code> and  <code>cause</code>.
      * The <code>SQLState</code> is  initialized to <code>null</code>
      * and the vendor code is initialized to 0.
-     * <p>
+     *
      * @param reason a description of the exception.
      * @param cause the underlying reason for this <code>SQLException</code> (which is saved for later retrieval by the <code>getCause()</code> method); may be null indicating
      *     the cause is non-existent or unknown.
@@ -143,7 +140,7 @@
      * with a given
      * <code>reason</code>, <code>SQLState</code> and  <code>cause</code>.
      * The vendor code is initialized to 0.
-     * <p>
+     *
      * @param reason a description of the exception.
      * @param SQLState an XOPEN or SQL:2003 code identifying the exception
      * @param cause the underlying reason for this <code>SQLException</code> (which is saved for later retrieval by the <code>getCause()</code> method); may be null indicating
@@ -155,11 +152,11 @@
     }
 
     /**
-     *  Constructs a <code>SQLNonTransientException</code> object
+     * Constructs a <code>SQLNonTransientException</code> object
      * with a given
      * <code>reason</code>, <code>SQLState</code>, <code>vendorCode</code>
      * and  <code>cause</code>.
-     * <p>
+     *
      * @param reason a description of the exception
      * @param SQLState an XOPEN or SQL:2003 code identifying the exception
      * @param vendorCode a database vendor-specific exception code
--- a/jdk/src/share/classes/java/sql/SQLPermission.java	Fri Mar 28 11:57:02 2014 +0100
+++ b/jdk/src/share/classes/java/sql/SQLPermission.java	Fri Mar 28 15:56:24 2014 +0400
@@ -104,7 +104,7 @@
  * registered Drivers and release its resources.</td>
  * </tr>
  * </table>
- *<p>
+ *
  * @since 1.3
  * @see java.security.BasicPermission
  * @see java.security.Permission
--- a/jdk/src/share/classes/java/sql/SQLRecoverableException.java	Fri Mar 28 11:57:02 2014 +0100
+++ b/jdk/src/share/classes/java/sql/SQLRecoverableException.java	Fri Mar 28 15:56:24 2014 +0400
@@ -32,7 +32,6 @@
  * distributed transaction, the transaction branch.  At a minimum,
  * the recovery operation must include closing the current connection and getting
  * a new connection.
- *<p>
  *
  * @since 1.6
  */
@@ -46,7 +45,7 @@
          * The <code>cause</code> is not initialized, and may subsequently be
          * initialized by a call to the
          * {@link Throwable#initCause(java.lang.Throwable)} method.
-         * <p>
+         *
          * @since 1.6
         */
         public SQLRecoverableException() {
@@ -62,7 +61,7 @@
          * The <code>cause</code> is not initialized, and may subsequently be
          * initialized by a call to the
          * {@link Throwable#initCause(java.lang.Throwable)} method.
-         * <p>
+         *
          * @param reason a description of the exception
          * @since 1.6
          */
@@ -78,7 +77,7 @@
          * initialized by a call to the
          * {@link Throwable#initCause(java.lang.Throwable)} method. The vendor code
          * is initialized to 0.
-         * <p>
+         *
          * @param reason a description of the exception
          * @param SQLState an XOPEN or SQL:2003 code identifying the exception
          * @since 1.6
@@ -95,7 +94,7 @@
          * The <code>cause</code> is not initialized, and may subsequently be
          * initialized by a call to the
          * {@link Throwable#initCause(java.lang.Throwable)} method.
-         * <p>
+         *
          * @param reason a description of the exception
          * @param SQLState an XOPEN or SQL:2003 code identifying the exception
          * @param vendorCode a database vendor specific exception code
@@ -113,7 +112,7 @@
      * The <code>reason</code>  is initialized to <code>null</code> if
      * <code>cause==null</code> or to <code>cause.toString()</code> if
      * <code>cause!=null</code>.
-     * <p>
+     *
      * @param cause the underlying reason for this <code>SQLException</code> (which is saved for later retrieval by the <code>getCause()</code> method); may be null indicating
      *     the cause is non-existent or unknown.
      * @since 1.6
@@ -128,7 +127,7 @@
      * <code>reason</code> and  <code>cause</code>.
      * The <code>SQLState</code> is  initialized to <code>null</code>
      * and the vendor code is initialized to 0.
-     * <p>
+     *
      * @param reason a description of the exception.
      * @param cause the underlying reason for this <code>SQLException</code> (which is saved for later retrieval by the <code>getCause()</code> method); may be null indicating
      *     the cause is non-existent or unknown.
@@ -143,7 +142,7 @@
      * with a given
      * <code>reason</code>, <code>SQLState</code> and  <code>cause</code>.
      * The vendor code is initialized to 0.
-     * <p>
+     *
      * @param reason a description of the exception.
      * @param SQLState an XOPEN or SQL:2003 code identifying the exception
      * @param cause the underlying reason for this <code>SQLException</code> (which is saved for later retrieval by the <code>getCause()</code> method); may be null indicating
@@ -159,7 +158,7 @@
      * with a given
      * <code>reason</code>, <code>SQLState</code>, <code>vendorCode</code>
      * and  <code>cause</code>.
-     * <p>
+     *
      * @param reason a description of the exception
      * @param SQLState an XOPEN or SQL:2003 code identifying the exception
      * @param vendorCode a database vendor-specific exception code
--- a/jdk/src/share/classes/java/sql/SQLSyntaxErrorException.java	Fri Mar 28 11:57:02 2014 +0100
+++ b/jdk/src/share/classes/java/sql/SQLSyntaxErrorException.java	Fri Mar 28 15:56:24 2014 +0400
@@ -44,7 +44,7 @@
          * The <code>cause</code> is not initialized, and may subsequently be
          * initialized by a call to the
          * {@link Throwable#initCause(java.lang.Throwable)} method.
-         * <p>
+         *
          * @since 1.6
          */
         public SQLSyntaxErrorException() {
@@ -60,7 +60,7 @@
          * The <code>cause</code> is not initialized, and may subsequently be
          * initialized by a call to the
          * {@link Throwable#initCause(java.lang.Throwable)} method.
-         * <p>
+         *
          * @param reason a description of the exception
          * @since 1.6
          */
@@ -76,7 +76,7 @@
          * initialized by a call to the
          * {@link Throwable#initCause(java.lang.Throwable)} method. The vendor code
          * is initialized to 0.
-         * <p>
+         *
          * @param reason a description of the exception
          * @param SQLState an XOPEN or SQL:2003 code identifying the exception
          * @since 1.6
@@ -93,7 +93,7 @@
          * The <code>cause</code> is not initialized, and may subsequently be
          * initialized by a call to the
          * {@link Throwable#initCause(java.lang.Throwable)} method.
-         * <p>
+         *
          * @param reason a description of the exception
          * @param SQLState an XOPEN or SQL:2003 code identifying the exception
          * @param vendorCode a database vendor specific exception code
@@ -111,7 +111,7 @@
      * The <code>reason</code>  is initialized to <code>null</code> if
      * <code>cause==null</code> or to <code>cause.toString()</code> if
      * <code>cause!=null</code>.
-     * <p>
+     *
      * @param cause the underlying reason for this <code>SQLException</code> (which is saved for later retrieval by the <code>getCause()</code> method); may be null indicating
      *     the cause is non-existent or unknown.
      * @since 1.6
@@ -126,7 +126,7 @@
      * <code>reason</code> and  <code>cause</code>.
      * The <code>SQLState</code> is  initialized to <code>null</code>
      * and the vendor code is initialized to 0.
-     * <p>
+     *
      * @param reason a description of the exception.
      * @param cause the underlying reason for this <code>SQLException</code> (which is saved for later retrieval by the <code>getCause()</code> method); may be null indicating
      *     the cause is non-existent or unknown.
@@ -141,7 +141,7 @@
      * with a given
      * <code>reason</code>, <code>SQLState</code> and  <code>cause</code>.
      * The vendor code is initialized to 0.
-     * <p>
+     *
      * @param reason a description of the exception.
      * @param SQLState an XOPEN or SQL:2003 code identifying the exception
      * @param cause the (which is saved for later retrieval by the <code>getCause()</code> method); may be null indicating
@@ -157,7 +157,7 @@
      * with a given
      * <code>reason</code>, <code>SQLState</code>, <code>vendorCode</code>
      * and  <code>cause</code>.
-     * <p>
+     *
      * @param reason a description of the exception
      * @param SQLState an XOPEN or SQL:2003 code identifying the exception
      * @param vendorCode a database vendor-specific exception code
--- a/jdk/src/share/classes/java/sql/SQLTimeoutException.java	Fri Mar 28 11:57:02 2014 +0100
+++ b/jdk/src/share/classes/java/sql/SQLTimeoutException.java	Fri Mar 28 15:56:24 2014 +0400
@@ -44,7 +44,7 @@
          * The <code>cause</code> is not initialized, and may subsequently be
          * initialized by a call to the
          * {@link Throwable#initCause(java.lang.Throwable)} method.
-         * <p>
+         *
          * @since 1.6
          */
         public SQLTimeoutException() {
@@ -60,7 +60,7 @@
          * The <code>cause</code> is not initialized, and may subsequently be
          * initialized by a call to the
          * {@link Throwable#initCause(java.lang.Throwable)} method.
-         * <p>
+         *
          * @param reason a description of the exception
          * @since 1.6
          */
@@ -76,7 +76,7 @@
          * initialized by a call to the
          * {@link Throwable#initCause(java.lang.Throwable)} method. The vendor code
          * is initialized to 0.
-         * <p>
+         *
          * @param reason a description of the exception
          * @param SQLState an XOPEN or SQL:2003 code identifying the exception
          * @since 1.6
@@ -93,7 +93,7 @@
          * The <code>cause</code> is not initialized, and may subsequently be
          * initialized by a call to the
          * {@link Throwable#initCause(java.lang.Throwable)} method.
-         * <p>
+         *
          * @param reason a description of the exception
          * @param SQLState an XOPEN or SQL:2003 code identifying the exception
          * @param vendorCode a database vendor specific exception code
@@ -111,7 +111,7 @@
      * The <code>reason</code>  is initialized to <code>null</code> if
      * <code>cause==null</code> or to <code>cause.toString()</code> if
      * <code>cause!=null</code>.
-     * <p>
+     *
      * @param cause the underlying reason for this <code>SQLException</code> (which is saved for later retrieval by the <code>getCause()</code> method); may be null indicating
      *     the cause is non-existent or unknown.
      * @since 1.6
@@ -126,7 +126,7 @@
      * <code>reason</code> and  <code>cause</code>.
      * The <code>SQLState</code> is  initialized to <code>null</code>
      * and the vendor code is initialized to 0.
-     * <p>
+     *
      * @param reason a description of the exception.
      * @param cause the underlying reason for this <code>SQLException</code> (which is saved for later retrieval by the <code>getCause()</code> method); may be null indicating
      *     the cause is non-existent or unknown.
@@ -141,7 +141,7 @@
      *  with a given
      * <code>reason</code>, <code>SQLState</code> and  <code>cause</code>.
      * The vendor code is initialized to 0.
-     * <p>
+     *
      * @param reason a description of the exception.
      * @param SQLState an XOPEN or SQL:2003 code identifying the exception
      * @param cause the underlying reason for this <code>SQLException</code> (which is saved for later retrieval by the <code>getCause()</code> method); may be null indicating
@@ -157,7 +157,7 @@
      * with a given
      * <code>reason</code>, <code>SQLState</code>, <code>vendorCode</code>
      * and  <code>cause</code>.
-     * <p>
+     *
      * @param reason a description of the exception
      * @param SQLState an XOPEN or SQL:2003 code identifying the exception
      * @param vendorCode a database vendor-specific exception code
--- a/jdk/src/share/classes/java/sql/SQLTransactionRollbackException.java	Fri Mar 28 11:57:02 2014 +0100
+++ b/jdk/src/share/classes/java/sql/SQLTransactionRollbackException.java	Fri Mar 28 15:56:24 2014 +0400
@@ -44,7 +44,7 @@
          * The <code>cause</code> is not initialized, and may subsequently be
          * initialized by a call to the
          * {@link Throwable#initCause(java.lang.Throwable)} method.
-         * <p>
+         *
          * @since 1.6
          */
         public SQLTransactionRollbackException() {
@@ -60,7 +60,7 @@
          * The <code>cause</code> is not initialized, and may subsequently be
          * initialized by a call to the
          * {@link Throwable#initCause(java.lang.Throwable)} method.
-         * <p>
+         *
          * @param reason a description of the exception
          * @since 1.6
          */
@@ -76,7 +76,7 @@
          * initialized by a call to the
          * {@link Throwable#initCause(java.lang.Throwable)} method. The vendor code
          * is initialized to 0.
-         * <p>
+         *
          * @param reason a description of the exception
          * @param SQLState an XOPEN or SQL:2003 code identifying the exception
          * @since 1.6
@@ -93,7 +93,7 @@
          * The <code>cause</code> is not initialized, and may subsequently be
          * initialized by a call to the
          * {@link Throwable#initCause(java.lang.Throwable)} method.
-         * <p>
+         *
          * @param reason a description of the exception
          * @param SQLState an XOPEN or SQL:2003 code identifying the exception
          * @param vendorCode a database vendor specific exception code
@@ -111,7 +111,7 @@
      * The <code>reason</code>  is initialized to <code>null</code> if
      * <code>cause==null</code> or to <code>cause.toString()</code> if
      * <code>cause!=null</code>.
-     * <p>
+     *
      * @param cause the underlying reason for this <code>SQLException</code> (which is saved for later retrieval by the <code>getCause()</code> method); may be null indicating
      *     the cause is non-existent or unknown.
      * @since 1.6
@@ -126,7 +126,7 @@
      * <code>reason</code> and  <code>cause</code>.
      * The <code>SQLState</code> is  initialized to <code>null</code>
      * and the vendor code is initialized to 0.
-     * <p>
+     *
      * @param reason a description of the exception.
      * @param cause the underlying reason for this <code>SQLException</code> (which is saved for later retrieval by the <code>getCause()</code> method); may be null indicating
      *     the cause is non-existent or unknown.
@@ -141,7 +141,7 @@
      * with a given
      * <code>reason</code>, <code>SQLState</code> and  <code>cause</code>.
      * The vendor code is initialized to 0.
-     * <p>
+     *
      * @param reason a description of the exception.
      * @param SQLState an XOPEN or SQL:2003 code identifying the exception
      * @param cause the underlying reason for this <code>SQLException</code> (which is saved for later retrieval by the <code>getCause()</code> method); may be null indicating
@@ -157,7 +157,7 @@
      * with a given
      * <code>reason</code>, <code>SQLState</code>, <code>vendorCode</code>
      * and  <code>cause</code>.
-     * <p>
+     *
      * @param reason a description of the exception
      * @param SQLState an XOPEN or SQL:2003 code identifying the exception
      * @param vendorCode a database vendor-specific exception code
--- a/jdk/src/share/classes/java/sql/SQLTransientConnectionException.java	Fri Mar 28 11:57:02 2014 +0100
+++ b/jdk/src/share/classes/java/sql/SQLTransientConnectionException.java	Fri Mar 28 15:56:24 2014 +0400
@@ -45,7 +45,7 @@
          * The <code>cause</code> is not initialized, and may subsequently be
          * initialized by a call to the
          * {@link Throwable#initCause(java.lang.Throwable)} method.
-         * <p>
+         *
          * @since 1.6
          */
         public SQLTransientConnectionException() {
@@ -61,7 +61,7 @@
          * The <code>cause</code> is not initialized, and may subsequently be
          * initialized by a call to the
          * {@link Throwable#initCause(java.lang.Throwable)} method.
-         * <p>
+         *
          * @param reason a description of the exception
          * @since 1.6
          */
@@ -77,7 +77,7 @@
          * initialized by a call to the
          * {@link Throwable#initCause(java.lang.Throwable)} method. The vendor code
          * is initialized to 0.
-         * <p>
+         *
          * @param reason a description of the exception
          * @param SQLState an XOPEN or SQL:2003 code identifying the exception
          * @since 1.6
@@ -94,7 +94,7 @@
          * The <code>cause</code> is not initialized, and may subsequently be
          * initialized by a call to the
          * {@link Throwable#initCause(java.lang.Throwable)} method.
-         * <p>
+         *
          * @param reason a description of the exception
          * @param SQLState an XOPEN or SQL:2003 code identifying the exception
          * @param vendorCode a database vendor specific exception code
@@ -112,7 +112,7 @@
      * The <code>reason</code>  is initialized to <code>null</code> if
      * <code>cause==null</code> or to <code>cause.toString()</code> if
      * <code>cause!=null</code>.
-     * <p>
+     *
      * @param cause the underlying reason for this <code>SQLException</code> (which is saved for later retrieval by the <code>getCause()</code> method); may be null indicating
      *     the cause is non-existent or unknown.
      * @since 1.6
@@ -127,7 +127,7 @@
      * <code>reason</code> and  <code>cause</code>.
      * The <code>SQLState</code> is  initialized to <code>null</code>
      * and the vendor code is initialized to 0.
-     * <p>
+     *
      * @param reason a description of the exception.
      * @param cause the underlying reason for this <code>SQLException</code>(which is saved for later retrieval by the <code>getCause()</code> method); may be null indicating
      *     the cause is non-existent or unknown.
@@ -142,7 +142,7 @@
      * with a given
      * <code>reason</code>, <code>SQLState</code> and  <code>cause</code>.
      * The vendor code is initialized to 0.
-     * <p>
+     *
      * @param reason a description of the exception.
      * @param SQLState an XOPEN or SQL:2003 code identifying the exception
      * @param cause the underlying reason for this <code>SQLException</code> (which is saved for later retrieval by the <code>getCause()</code> method); may be null indicating
@@ -158,7 +158,7 @@
      * with a given
      * <code>reason</code>, <code>SQLState</code>, <code>vendorCode</code>
      * and  <code>cause</code>.
-     * <p>
+     *
      * @param reason a description of the exception
      * @param SQLState an XOPEN or SQL:2003 code identifying the exception
      * @param vendorCode a database vendor-specific exception code
--- a/jdk/src/share/classes/java/sql/SQLTransientException.java	Fri Mar 28 11:57:02 2014 +0100
+++ b/jdk/src/share/classes/java/sql/SQLTransientException.java	Fri Mar 28 15:56:24 2014 +0400
@@ -29,7 +29,6 @@
  * The subclass of {@link SQLException} is thrown in situations where a
  * previously failed operation might be able to succeed when the operation is
  * retried without any intervention by application-level functionality.
- *<p>
  *
  * @since 1.6
  */
@@ -43,7 +42,7 @@
          * The <code>cause</code> is not initialized, and may subsequently be
          * initialized by a call to the
          * {@link Throwable#initCause(java.lang.Throwable)} method.
-         * <p>
+         *
          * @since 1.6
         */
         public SQLTransientException() {
@@ -59,7 +58,7 @@
          * The <code>cause</code> is not initialized, and may subsequently be
          * initialized by a call to the
          * {@link Throwable#initCause(java.lang.Throwable)} method.
-         * <p>
+         *
          * @param reason a description of the exception
          * @since 1.6
          */
@@ -75,7 +74,7 @@
          * initialized by a call to the
          * {@link Throwable#initCause(java.lang.Throwable)} method. The vendor code
          * is initialized to 0.
-         * <p>
+         *
          * @param reason a description of the exception
          * @param SQLState an XOPEN or SQL:2003 code identifying the exception
          * @since 1.6
@@ -92,7 +91,7 @@
          * The <code>cause</code> is not initialized, and may subsequently be
          * initialized by a call to the
          * {@link Throwable#initCause(java.lang.Throwable)} method.
-         * <p>
+         *
          * @param reason a description of the exception
          * @param SQLState an XOPEN or SQL:2003 code identifying the exception
          * @param vendorCode a database vendor specific exception code
@@ -110,7 +109,7 @@
      * The <code>reason</code>  is initialized to <code>null</code> if
      * <code>cause==null</code> or to <code>cause.toString()</code> if
      * <code>cause!=null</code>.
-     * <p>
+     *
      * @param cause the underlying reason for this <code>SQLException</code> (which is saved for later retrieval by the <code>getCause()</code> method); may be null indicating
      *     the cause is non-existent or unknown.
      * @since 1.6
@@ -125,7 +124,7 @@
      * <code>reason</code> and  <code>cause</code>.
      * The <code>SQLState</code> is  initialized to <code>null</code>
      * and the vendor code is initialized to 0.
-     * <p>
+     *
      * @param reason a description of the exception.
      * @param cause the underlying reason for this <code>SQLException</code> (which is saved for later retrieval by the <code>getCause()</code> method); may be null indicating
      *     the cause is non-existent or unknown.
@@ -140,7 +139,7 @@
      * with a given
      * <code>reason</code>, <code>SQLState</code> and  <code>cause</code>.
      * The vendor code is initialized to 0.
-     * <p>
+     *
      * @param reason a description of the exception.
      * @param SQLState an XOPEN or SQL:2003 code identifying the exception
      * @param cause the underlying reason for this <code>SQLException</code> (which is saved for later retrieval by the <code>getCause()</code> method); may be null indicating
@@ -156,7 +155,7 @@
      * with a given
      * <code>reason</code>, <code>SQLState</code>, <code>vendorCode</code>
      * and  <code>cause</code>.
-     * <p>
+     *
      * @param reason a description of the exception
      * @param SQLState an XOPEN or SQL:2003 code identifying the exception
      * @param vendorCode a database vendor-specific exception code
--- a/jdk/src/share/classes/java/sql/SQLWarning.java	Fri Mar 28 11:57:02 2014 +0100
+++ b/jdk/src/share/classes/java/sql/SQLWarning.java	Fri Mar 28 15:56:24 2014 +0400
@@ -52,7 +52,7 @@
      * The <code>cause</code> is not initialized, and may subsequently be
      * initialized by a call to the
      * {@link Throwable#initCause(java.lang.Throwable)} method.
-     * <p>
+     *
      * @param reason a description of the warning
      * @param SQLState an XOPEN or SQL:2003 code identifying the warning
      * @param vendorCode a database vendor-specific warning code
@@ -73,7 +73,7 @@
      * initialized by a call to the
      * {@link Throwable#initCause(java.lang.Throwable)} method. The vendor code
      * is initialized to 0.
-     * <p>
+     *
      * @param reason a description of the warning
      * @param SQLState an XOPEN or SQL:2003 code identifying the warning
      */
@@ -92,7 +92,7 @@
      * The <code>cause</code> is not initialized, and may subsequently be
      * initialized by a call to the
      * {@link Throwable#initCause(java.lang.Throwable)} method.
-     * <p>
+     *
      * @param reason a description of the warning
      */
     public SQLWarning(String reason) {
@@ -123,7 +123,7 @@
      * The <code>reason</code>  is initialized to <code>null</code> if
      * <code>cause==null</code> or to <code>cause.toString()</code> if
      * <code>cause!=null</code>.
-     * <p>
+     *
      * @param cause the underlying reason for this <code>SQLWarning</code> (which is saved for later retrieval by the <code>getCause()</code> method); may be null indicating
      *     the cause is non-existent or unknown.
      */
@@ -138,7 +138,7 @@
      * <code>reason</code> and  <code>cause</code>.
      * The <code>SQLState</code> is  initialized to <code>null</code>
      * and the vendor code is initialized to 0.
-     * <p>
+     *
      * @param reason a description of the warning
      * @param cause  the underlying reason for this <code>SQLWarning</code>
      * (which is saved for later retrieval by the <code>getCause()</code> method);
@@ -154,7 +154,7 @@
      * with a given
      * <code>reason</code>, <code>SQLState</code> and  <code>cause</code>.
      * The vendor code is initialized to 0.
-     * <p>
+     *
      * @param reason a description of the warning
      * @param SQLState an XOPEN or SQL:2003 code identifying the warning
      * @param cause the underlying reason for this <code>SQLWarning</code> (which is saved for later retrieval by the <code>getCause()</code> method); may be null indicating
@@ -171,7 +171,7 @@
      * with a given
      * <code>reason</code>, <code>SQLState</code>, <code>vendorCode</code>
      * and  <code>cause</code>.
-     * <p>
+     *
      * @param reason a description of the warning
      * @param SQLState an XOPEN or SQL:2003 code identifying the warning
      * @param vendorCode a database vendor-specific warning code
--- a/jdk/src/share/classes/java/sql/Statement.java	Fri Mar 28 11:57:02 2014 +0100
+++ b/jdk/src/share/classes/java/sql/Statement.java	Fri Mar 28 15:56:24 2014 +0400
@@ -522,7 +522,7 @@
     /**
      * Empties this <code>Statement</code> object's current list of
      * SQL commands.
-     * <P>
+     *
      * @exception SQLException if a database access error occurs,
      *  this method is called on a closed <code>Statement</code> or the
      * driver does not support batch updates
@@ -1009,13 +1009,13 @@
          * By default, a <code>Statement</code> is not poolable when created, and
          * a <code>PreparedStatement</code> and <code>CallableStatement</code>
          * are poolable when created.
-         * <p>
+         *
          * @param poolable              requests that the statement be pooled if true and
          *                                              that the statement not be pooled if false
-         * <p>
+         *
          * @throws SQLException if this method is called on a closed
          * <code>Statement</code>
-         * <p>
+         *
          * @since 1.6
          */
         void setPoolable(boolean poolable)
@@ -1024,15 +1024,15 @@
         /**
          * Returns a  value indicating whether the <code>Statement</code>
          * is poolable or not.
-         * <p>
+         *
          * @return              <code>true</code> if the <code>Statement</code>
          * is poolable; <code>false</code> otherwise
-         * <p>
+         *
          * @throws SQLException if this method is called on a closed
          * <code>Statement</code>
-         * <p>
+         *
          * @since 1.6
-         * <p>
+         *
          * @see java.sql.Statement#setPoolable(boolean) setPoolable(boolean)
          */
         boolean isPoolable()
--- a/jdk/src/share/classes/java/sql/Timestamp.java	Fri Mar 28 11:57:02 2014 +0100
+++ b/jdk/src/share/classes/java/sql/Timestamp.java	Fri Mar 28 15:56:24 2014 +0400
@@ -269,7 +269,7 @@
      * Formats a timestamp in JDBC timestamp escape format.
      *         <code>yyyy-mm-dd hh:mm:ss.fffffffff</code>,
      * where <code>ffffffffff</code> indicates nanoseconds.
-     * <P>
+     *
      * @return a <code>String</code> object in
      *           <code>yyyy-mm-dd hh:mm:ss.fffffffff</code> format
      */
--- a/jdk/src/share/classes/java/sql/package.html	Fri Mar 28 11:57:02 2014 +0100
+++ b/jdk/src/share/classes/java/sql/package.html	Fri Mar 28 15:56:24 2014 +0400
@@ -44,7 +44,7 @@
 <code>javax.sql.RowSet</code> group of interfaces, can be customized to
 use and update data from a spread sheet, flat file, or any other tabular 
 data source.
-<P>
+
 <h2>What the JDBC<sup><font size=-2>TM</font></sup> 4.2 API Includes</h2>
 The JDBC<sup><font size=-2>TM</font></sup> 4.2 API includes both
 the <code>java.sql</code> package, referred to as the JDBC core API,
@@ -56,7 +56,7 @@
 from a client-side API to a server-side API, and it is an essential part
 of the Java<sup><font size=-2>TM</font></sup>  Enterprise Edition
 (Java EE<sup><font size=-2>TM</font></sup>) technology. 
-<P>
+
 <h2>Versions</h2>
 The JDBC 4.2 API incorporates all of the previous JDBC API versions:
 <UL>
@@ -101,7 +101,6 @@
 version 1.3 release. This class is used to prevent unauthorized
 access to the logging stream associated with the <code>DriverManager</code>,
 which may contain information such as table names, column data, and so on.
-<p>
 
 <h2>What the <code>java.sql</code> Package Contains</h2>
 The <code>java.sql</code> package contains API for the following:
@@ -181,7 +180,7 @@
 		 commands in a batch update executed successfully
 	</UL>
 </UL>
-<P>
+
     <h3><code>java.sql</code> and <code>javax.sql</code> Features Introduced in the JDBC 4.2 API</h3>
 <UL>
     <LI>Added <code>JDBCType</code>  enum and <code>SQLType</code> interface</li>
@@ -192,7 +191,7 @@
     <LI>Added support for large update counts</LI>
 
 </UL>
-<P>
+
     <h3><code>java.sql</code> and <code>javax.sql</code> Features Introduced in the JDBC 4.1 API</h3>
 <UL>
     <LI>Allow <code>Connection</code>,
@@ -231,8 +230,8 @@
  
  
 </UL>
-<P>
-<P>
+
+
 <h3><code>java.sql</code> and <code>javax.sql</code> Features Introduced in the JDBC 3.0 API</h3>
 <UL>
   <LI>Pooled statements -- reuse of statements associated with a pooled 
@@ -258,7 +257,7 @@
       allows JDBC drivers access to objects stored outside a data source
   <LI>Addition of metadata for retrieving SQL type hierarchies
 </UL>
-<P>
+
 <h3><code>java.sql</code> Features Introduced in the JDBC 2.1 Core API</h3>
 <UL>
   <LI>Scrollable result sets--using new methods in the <code>ResultSet</code>
@@ -273,7 +272,7 @@
 	  additional security, and
 	  support for time zones in date, time, and timestamp values. 
 </UL>
-<P>
+
 <h3><code>javax.sql</code> Features Introduced in the JDBC 2.0 Optional
 Package API</h3>
 <UL>
@@ -287,8 +286,8 @@
   <LI><code>RowSet</code> technology -- providing a convenient means of
        handling and passing data
 </UL>
-<P>
-<P>
+
+
 <h3>Custom Mapping of UDTs</h3>
 A user-defined type (UDT) defined in SQL can be mapped to a class in the Java
 programming language. An SQL structured type or an SQL <code>DISTINCT</code>
@@ -325,16 +324,16 @@
 
 <ul>
   <li><a href="../../../technotes/guides/jdbc/getstart/GettingStartedTOC.fm.html">Getting Started</a>--overviews of the major interfaces
-<P>
+
   <li><a href="http://java.sun.com/docs/books/tutorial/jdbc">Chapters on the JDBC 
      API</a>--from the online version of <i>The Java Tutorial Continued</i>
-<P>
+
   <li><a href="http://java.sun.com/docs/books/jdbc">
 <i>JDBC<sup><font size=-2>TM</font></sup>API Tutorial and Reference, 
 Third Edition</i></a>--
 a complete reference and tutorial for the JDBC 3.0 API
 </ul>
-<P>
+
 @since 1.1
 </body>
 </html>