db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1523762 - in /db/derby/code/branches/10.10/java: client/org/apache/derby/client/am/ client/org/apache/derby/client/net/ engine/org/apache/derby/catalog/ engine/org/apache/derby/iapi/db/ engine/org/apache/derby/iapi/jdbc/ engine/org/apache/...
Date Mon, 16 Sep 2013 19:05:15 GMT
Author: mamta
Date: Mon Sep 16 19:05:14 2013
New Revision: 1523762

URL: http://svn.apache.org/r1523762
Log:
DERBY-6323(Fix incorrect @throws and @exception tags in javadoc)

There were handful of conflicts so I hand backported this jira from trunk(10.11) to 10.10


Modified:
    db/derby/code/branches/10.10/java/client/org/apache/derby/client/am/LogicalConnection40.java
    db/derby/code/branches/10.10/java/client/org/apache/derby/client/net/NetConnection40.java
    db/derby/code/branches/10.10/java/client/org/apache/derby/client/net/NetResultSet40.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/catalog/SystemProcedures.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/db/Database.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection40.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/jdbc/DRDAServerStarter.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/services/io/ArrayInputStream.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/services/io/DataInputUtil.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/services/io/Limit.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/services/io/LimitInputStream.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/services/io/LimitReader.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/services/jmx/ManagementService.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/services/locks/LockFactory.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/services/monitor/PersistentService.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/sql/ResultColumnDescriptor.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/sql/compile/TypeCompilerFactory.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/sql/conn/Authorizer.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/sql/conn/LanguageConnectionContext.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/sql/dictionary/TableDescriptor.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/store/access/FileResource.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/store/access/conglomerate/Conglomerate.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/store/raw/ContainerHandle.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/store/raw/FetchDescriptor.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/store/raw/Page.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/store/raw/Transaction.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/types/HarmonySerialBlob.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/types/PositionedStream.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/types/SQLChar.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/types/SQLDate.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/types/SQLLongint.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/types/SQLTime.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/types/XML.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/types/XMLDataValue.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/jdbc/EmbedConnection40.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement40.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet40.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/jdbc/EmbedResultSetMetaData40.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/jdbc/EmbedStatement40.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/load/Export.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/load/Import.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionContext.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/store/access/UTFQualifier.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/store/access/btree/ControlRow.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/store/access/conglomerate/OpenConglomerateScratchSpace.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/store/raw/data/AllocExtent.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/store/raw/data/StoredFieldHeader.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/store/raw/data/StoredPage.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/store/raw/data/StoredRecordHeader.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/store/raw/data/StreamFileContainer.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/store/raw/xact/Xact.java
    db/derby/code/branches/10.10/java/engine/org/apache/derby/io/StorageRandomAccessFile.java

Modified: db/derby/code/branches/10.10/java/client/org/apache/derby/client/am/LogicalConnection40.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/client/org/apache/derby/client/am/LogicalConnection40.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/client/org/apache/derby/client/am/LogicalConnection40.java (original)
+++ db/derby/code/branches/10.10/java/client/org/apache/derby/client/am/LogicalConnection40.java Mon Sep 16 19:05:14 2013
@@ -251,7 +251,7 @@ public class LogicalConnection40
      *
      * @param name a property key <code>String</code>
      * @param value a property value <code>String</code>
-     * @exception SQLException if an error occurs
+     * @exception SQLClientInfoException if an error occurs
      */
     public void setClientInfo(String name, String value)
         throws SQLClientInfoException {

Modified: db/derby/code/branches/10.10/java/client/org/apache/derby/client/net/NetConnection40.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/client/org/apache/derby/client/net/NetConnection40.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/client/org/apache/derby/client/net/NetConnection40.java (original)
+++ db/derby/code/branches/10.10/java/client/org/apache/derby/client/net/NetConnection40.java Mon Sep 16 19:05:14 2013
@@ -233,7 +233,7 @@ public class  NetConnection40 extends or
      *
      * @param name a property key <code>String</code>
      * @param value a property value <code>String</code>
-     * @exception SQLException always.
+     * @exception SQLClientInfoException always.
      */
     public void setClientInfo(String name, String value)
     throws SQLClientInfoException{

Modified: db/derby/code/branches/10.10/java/client/org/apache/derby/client/net/NetResultSet40.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/client/org/apache/derby/client/net/NetResultSet40.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/client/org/apache/derby/client/net/NetResultSet40.java (original)
+++ db/derby/code/branches/10.10/java/client/org/apache/derby/client/net/NetResultSet40.java Mon Sep 16 19:05:14 2013
@@ -179,7 +179,7 @@ public class NetResultSet40 extends NetR
      *
      * @param  interfaces a Class defining an interface
      * @return an object that implements the interface
-     * @throws java.sql.SQLExption if no object if found that implements the 
+     * @throws SQLException if no object if found that implements the 
      * interface
      */
     public <T> T unwrap(java.lang.Class<T> interfaces)

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/catalog/SystemProcedures.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/catalog/SystemProcedures.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/catalog/SystemProcedures.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/catalog/SystemProcedures.java Mon Sep 16 19:05:14 2013
@@ -679,7 +679,7 @@ public class SystemProcedures  {
      * @param key       The property key.
      * @param value     The new value, if null the property is deleted.
      *
-	 * @exception  StandardException  Standard exception policy.
+	 * @exception  SQLException  if a database error occurs
      **/
     public static void SYSCS_SET_DATABASE_PROPERTY(
     String  key,
@@ -696,7 +696,7 @@ public class SystemProcedures  {
      *
      * @param key       The property key.
      *
-	 * @exception  StandardException  Standard exception policy.
+	 * @exception  SQLException  if a database error occurs
      **/
     public static String SYSCS_GET_DATABASE_PROPERTY(
     String  key)
@@ -881,7 +881,7 @@ public class SystemProcedures  {
      * @param sequential    if non-zero then rebuild indexes sequentially,
      *                      if 0 then rebuild all indexes in parallel.
      *
-	 * @exception  StandardException  Standard exception policy.
+	 * @exception  SQLException  if a database error occurs
      **/
     public static void SYSCS_COMPRESS_TABLE(
     String  schemaname,
@@ -909,7 +909,7 @@ public class SystemProcedures  {
      * Call internal routine to freeze the database so that a backup
      * can be made.
      *
-	 * @exception  StandardException  Standard exception policy.
+	 * @exception  SQLException  if a database error occurs
      **/
     public static void SYSCS_FREEZE_DATABASE()
 		throws SQLException
@@ -924,7 +924,7 @@ public class SystemProcedures  {
      * by calling SYSCS_FREEZE_DATABASE().
      * can be made.
      *
-	 * @exception  StandardException  Standard exception policy.
+	 * @exception  SQLException  if a database error occurs
      **/
     public static void SYSCS_UNFREEZE_DATABASE()
 		throws SQLException
@@ -953,7 +953,7 @@ public class SystemProcedures  {
      * @param backupDir the name of the directory where the backup should be
      *                  stored. This directory will be created if it 
      *                  does not exist.
-     * @exception StandardException thrown on error
+     * @exception SQLException if a database error occurs
      */
     public static void SYSCS_BACKUP_DATABASE(String  backupDir)
 		throws SQLException
@@ -975,7 +975,7 @@ public class SystemProcedures  {
      * @param backupDir the name of the directory where the backup should be
      *                  stored. This directory will be created if it 
      *                  does not exist.
-     * @exception StandardException thrown on error
+     * @exception SQLException if a database error occurs
      */
     public static void SYSCS_BACKUP_DATABASE_NOWAIT(String  backupDir)
         throws SQLException
@@ -1004,7 +1004,7 @@ public class SystemProcedures  {
      * @param deleteOnlineArchivedLogFiles  If <tt>non-zero</tt> deletes online 
      *                 archived log files that exist before this backup, delete 
      *                 will occur  only after the backup is  complete.
-     * @exception StandardException thrown on error.
+     * @exception SQLException if a database error occurs
      */
     public static void SYSCS_BACKUP_DATABASE_AND_ENABLE_LOG_ARCHIVE_MODE(
     String  backupDir,
@@ -1040,7 +1040,7 @@ public class SystemProcedures  {
      *                  archived log files that exist before this backup, delete     
      *                  will occur  only after the backup is  complete.
      *
-     * @exception StandardException thrown on error.
+     * @exception SQLException if a database error occurs
      */
     public static void SYSCS_BACKUP_DATABASE_AND_ENABLE_LOG_ARCHIVE_MODE_NOWAIT(
     String  backupDir,
@@ -1062,7 +1062,7 @@ public class SystemProcedures  {
 	 * @param deleteOnlineArchivedLogFiles  If <tt>non-zero</tt> deletes all the
 	 *        online archived log files that exist before this call immediately.
      *
-	 * @exception StandardException Thrown on error
+	 * @exception SQLException if a database error occurs
 	 */
 
     public static void SYSCS_DISABLE_LOG_ARCHIVE_MODE(
@@ -1431,7 +1431,7 @@ public class SystemProcedures  {
 	 * IN TABLENAME    VARCHAR(128),  IN FILENAME VARCHAR(32672) , 
 	 * IN COLUMNDELIMITER CHAR(1),  IN CHARACTERDELIMITER CHAR(1) ,  
 	 * IN CODESET VARCHAR(128))
-	 * @exception  StandardException  Standard exception policy.
+	 * @exception  SQLException  if a database error occurs
      **/
 	public static void SYSCS_EXPORT_TABLE(
 	String  schemaName,
@@ -1460,7 +1460,7 @@ public class SystemProcedures  {
      * IN TABLENAME    VARCHAR(128),  IN FILENAME VARCHAR(32672) , 
      * IN COLUMNDELIMITER CHAR(1),  IN CHARACTERDELIMITER CHAR(1) ,  
      * IN CODESET VARCHAR(128), IN LOBSFILENAME VARCHAR(32672))
-     * @exception  StandardException  Standard exception policy.
+     * @exception  SQLException  if a database error occurs
      **/
     public static void SYSCS_EXPORT_TABLE_LOBS_TO_EXTFILE(
     String  schemaName,
@@ -1492,7 +1492,7 @@ public class SystemProcedures  {
 	 * IN COLUMNDELIMITER CHAR(1),  IN CHARACTERDELIMITER CHAR(1) ,  
 	 * IN CODESET VARCHAR(128))
 	 *
-	 * @exception  StandardException  Standard exception policy.
+	 * @exception  SQLException  if a database error occurs
      **/
 	public static void SYSCS_EXPORT_QUERY(
     String  selectStatement,
@@ -1523,7 +1523,7 @@ public class SystemProcedures  {
      * IN COLUMNDELIMITER CHAR(1),  IN CHARACTERDELIMITER CHAR(1) ,  
      * IN CODESET VARCHAR(128), IN LOBSFILENAME VARCHAR(32672))
      *
-     * @exception  StandardException  Standard exception policy.
+     * @exception  SQLException  if a database error occurs
      **/
     public static void SYSCS_EXPORT_QUERY_LOBS_TO_EXTFILE(
     String  selectStatement,
@@ -1555,7 +1555,7 @@ public class SystemProcedures  {
 	 * IN TABLENAME    VARCHAR(128),  IN FILENAME VARCHAR(32672) , 
 	 * IN COLUMNDELIMITER CHAR(1),  IN CHARACTERDELIMITER CHAR(1) ,  
 	 * IN CODESET VARCHAR(128), IN  REPLACE SMALLINT)
-	 * @exception  StandardException  Standard exception policy.
+	 * @exception  SQLException  if a database error occurs
      **/
 	public static void SYSCS_IMPORT_TABLE(
 	String  schemaName,
@@ -1605,7 +1605,7 @@ public class SystemProcedures  {
      * IN TABLENAME    VARCHAR(128),  IN FILENAME VARCHAR(32672) , 
      * IN COLUMNDELIMITER CHAR(1),  IN CHARACTERDELIMITER CHAR(1) ,  
      * IN CODESET VARCHAR(128), IN  REPLACE SMALLINT)
-     * @exception  StandardException  Standard exception policy.
+     * @exception  SQLException  if a database error occurs
      **/
     public static void SYSCS_IMPORT_TABLE_LOBS_FROM_EXTFILE(
     String  schemaName,
@@ -1645,7 +1645,7 @@ public class SystemProcedures  {
 	 *                    IN CHARACTERDELIMITER CHAR(1), IN CODESET VARCHAR(128), 
 	 *                    IN REPLACE SMALLINT)
 	 *
-	 * @exception  StandardException  Standard exception policy.
+	 * @exception  SQLException  if a database error occurs
      **/
 	public static void SYSCS_IMPORT_DATA(
     String  schemaName,
@@ -1691,7 +1691,7 @@ public class SystemProcedures  {
      *               IN CHARACTERDELIMITER CHAR(1), IN CODESET VARCHAR(128), 
      *               IN REPLACE SMALLINT)
      *
-     * @exception  StandardException  Standard exception policy.
+     * @exception  SQLException  if a database error occurs
      **/
     public static void SYSCS_IMPORT_DATA_LOBS_FROM_EXTFILE(
     String  schemaName,
@@ -1728,7 +1728,7 @@ public class SystemProcedures  {
 	 * SYSCS_BULK_INSERT (IN SCHEMANAME VARCHAR(128), IN TABLENAME VARCHAR(128), 
 	 *                    IN VTINAME VARCHAR(32672), IN VTIARG VARCHAR(32672))
 	 *
-	 * @exception  StandardException  Standard exception policy.
+	 * @exception  SQLException  if a database error occurs
      **/
 	public static void SYSCS_BULK_INSERT(
     String  schemaName,
@@ -2030,7 +2030,7 @@ public class SystemProcedures  {
 	 /**
      * this procedure switches between the different xplain modes 
      * @param mode either 0 for explain only, or 1 for explain & execute (default)
-     * @throws SQLException
+     * @throws SQLException, StandardException
      */
     public static void SYSCS_SET_XPLAIN_MODE(int mode)
                 throws SQLException, StandardException
@@ -2044,7 +2044,7 @@ public class SystemProcedures  {
      * are being XPLAIN'd only, not executed.
      *
      * @return 0 if XPLAIN mode is off, non-zero if on.
-     * @throws SQLException
+     * @throws SQLException, StandardException
      */
     public static int SYSCS_GET_XPLAIN_MODE()
                 throws SQLException, StandardException
@@ -2058,7 +2058,7 @@ public class SystemProcedures  {
      * textual stream printout. If it is set, statisitcs information is
      * stored in that schema in user tables.
      * @param schemaName May be an empty string.
-     * @throws SQLException
+     * @throws SQLException, StandardException
      */
     public static void SYSCS_SET_XPLAIN_SCHEMA(String schemaName)
                 throws SQLException, StandardException
@@ -2152,7 +2152,7 @@ public class SystemProcedures  {
     /**
      * This procedure returns the current set XPLAIN_SCHEMA
      * @return schema name, may be blank if no schema currently set.
-     * @throws SQLException
+     * @throws SQLException, StandardException
      */
     public static String SYSCS_GET_XPLAIN_SCHEMA()
                 throws SQLException, StandardException
@@ -2404,7 +2404,7 @@ public class SystemProcedures  {
      * @param schemaName    The name of the schema holding the sequence.
      * @param sequenceName    The name of the sequence in that schema.
      *
-	 * @exception  StandardException  Standard exception policy.
+	 * @exception  SQLException  if a database error occurs
      **/
     public static Long SYSCS_PEEK_AT_SEQUENCE( String schemaName, String sequenceName )
         throws SQLException

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/db/Database.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/db/Database.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/db/Database.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/db/Database.java Mon Sep 16 19:05:14 2013
@@ -103,7 +103,7 @@ public interface Database extends org.ap
 	 * and at the system level.
 	 *
 	 * @return	The authentication service handle for the database
-	 * @exception Standard Derby exception policy
+	 * @exception StandardException Standard Derby exception policy
 	 */
 	public AuthenticationService getAuthenticationService()
 		throws StandardException;

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection40.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection40.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection40.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection40.java Mon Sep 16 19:05:14 2013
@@ -307,7 +307,7 @@ public class BrokeredConnection40
      *
      * @param  interfaces a Class defining an interface
      * @return an object that implements the interface
-     * @throws java.sql.SQLExption if no object if found that implements the 
+     * @throws SQLException if no object if found that implements the 
      * interface
      */
     public final <T> T unwrap(java.lang.Class<T> interfaces) 

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/jdbc/DRDAServerStarter.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/jdbc/DRDAServerStarter.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/jdbc/DRDAServerStarter.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/jdbc/DRDAServerStarter.java Mon Sep 16 19:05:14 2013
@@ -101,8 +101,6 @@ public final class DRDAServerStarter imp
 	 * @param portNumber    portNumber to listen on
 	 * @param userName      the user name for actions requiring authorization
 	 * @param password      the password for actions requiring authorization
-     *
-	 * @throws Exception on error
 	 */
 	public void setStartInfo(InetAddress listenAddress, int portNumber,
                              String userName, String password,

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/services/io/ArrayInputStream.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/services/io/ArrayInputStream.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/services/io/ArrayInputStream.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/services/io/ArrayInputStream.java Mon Sep 16 19:05:14 2013
@@ -389,7 +389,7 @@ public final class ArrayInputStream exte
      *                      one passed in.
      * @param utflen the byte length of the value, or {@code 0} if unknown
      *
-	 * @exception  StandardException  Standard exception policy.
+	 * @exception  IOException  if an I/O error happens
      **/
     public final int readDerbyUTF(char[][] rawData_array, int utflen)
         throws IOException
@@ -558,7 +558,7 @@ public final class ArrayInputStream exte
      * 4 byte- 1xxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx val > 16383 && <= MAX_INT
      * </PRE>
      *
-	 * @exception  StandardException  Standard exception policy.
+	 * @exception  IOException  if an I/O error happens
      **/
     public final int readCompressedInt()
         throws IOException

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/services/io/DataInputUtil.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/services/io/DataInputUtil.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/services/io/DataInputUtil.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/services/io/DataInputUtil.java Mon Sep 16 19:05:14 2013
@@ -22,6 +22,7 @@
 package org.apache.derby.iapi.services.io;
 
 import java.io.DataInput;
+
 import java.io.IOException;
 
 /**
@@ -31,7 +32,7 @@ public final class DataInputUtil {
 
     /**
      * Skips requested number of bytes,
-     * throws EOFException if there is too few bytes in the DataInput.
+     * throws java.io.EOFException if there is too few bytes in the DataInput.
      * @param in
      *      DataInput to be skipped.
      * @param skippedBytes

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/services/io/Limit.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/services/io/Limit.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/services/io/Limit.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/services/io/Limit.java Mon Sep 16 19:05:14 2013
@@ -42,7 +42,7 @@ public interface Limit {
 		more beyond the limit will result in an EOFException
 
 		@exception IOException IOException from some underlying stream
-		@exception EOFException The set limit would exceed
+		@exception java.io.EOFException The set limit would exceed
 		the available data in the stream.
 	*/
 	public void setLimit(int length)

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/services/io/LimitInputStream.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/services/io/LimitInputStream.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/services/io/LimitInputStream.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/services/io/LimitInputStream.java Mon Sep 16 19:05:14 2013
@@ -116,15 +116,10 @@ public class LimitInputStream extends Fi
 		call up to and including length bytes can be read from or skipped in
 		the stream. Any attempt to read more than length bytes will
 		result in an EOFException
-
-		@exception IOException IOException from some underlying stream
-		@exception EOFException The set limit would exceed
-		the available data in the stream.
 	*/
 	public void setLimit(int length) {
 		remainingBytes = length;
 		limitInPlace = true;
-		return;
 	}
 
 	/**

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/services/io/LimitReader.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/services/io/LimitReader.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/services/io/LimitReader.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/services/io/LimitReader.java Mon Sep 16 19:05:14 2013
@@ -109,16 +109,11 @@ public final class LimitReader extends R
         or skipped in the stream.
         Any attempt to read more than length characters will
 		result in an EOFException
-
-		@exception IOException IOException from some underlying stream
-		@exception EOFException The set limit would exceed
-		the available data in the stream.
 	*/
 	public void setLimit(int length) 
 	{
 		remainingCharacters = length;
 		limitInPlace = true;
-		return;
 	}
     
     /**

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/services/jmx/ManagementService.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/services/jmx/ManagementService.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/services/jmx/ManagementService.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/services/jmx/ManagementService.java Mon Sep 16 19:05:14 2013
@@ -71,7 +71,6 @@ public interface ManagementService exten
      * Unregister a mbean previously registered with registerMBean.
      * 
      * @param mbeanIdentifier An identifier returned by registerMBean.
-     * @throws StandardException Error unregistering bean.
      */
     public void unregisterMBean(Object mbeanIdentifier);
 }

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/services/locks/LockFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/services/locks/LockFactory.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/services/locks/LockFactory.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/services/locks/LockFactory.java Mon Sep 16 19:05:14 2013
@@ -75,14 +75,13 @@ public interface LockFactory extends Pro
 		@return true if the lock was obtained, false if timeout is equal to LockFactory.NO_WAIT and the lock
 		could not be granted.
 
-		@exception org.apache.derby.iapi.error.StandardException A deadlock has occured (message id will be LockFactory.Deadlock)
-		@exception org.apache.derby.iapi.error.StandardException The wait for the lock timed out (message id will be LockFactory.TimeOut).
-		@exception org.apache.derby.iapi.error.StandardException Another thread interupted this thread while
-		it was waiting for the lock. This will be a StandardException with a nested java.lang.InterruptedException exception,
-		(message id will be LockFactory.InterruptedExceptionId)
-		@exception StandardException Standard Derby error policy.
-
-	*/
+        @exception StandardException if a deadlock has occurred (message id
+            will be LockFactory.Deadlock), or if the wait for the lock timed
+            out (message id will be LockFactory.TimeOut), or if another thread
+            interrupted this thread while it was waiting for the lock (this will
+            be a StandardException with a nested InterruptedException, and the
+            message id will be LockFactory.InterruptedExceptionId), or if
+            any other error occurs when locking the object	*/
 	public boolean lockObject(CompatibilitySpace compatibilitySpace,
 							  Object group, Lockable ref, Object qualifier,
 							  int timeout)
@@ -170,13 +169,13 @@ public interface LockFactory extends Pro
 		@return true if the lock was obtained, false if timeout is equal to LockFactory.NO_WAIT and the lock
 		could not be granted.
 
-		@exception org.apache.derby.iapi.error.StandardException A deadlock has occured (message id will be LockFactory.Deadlock)
-		@exception org.apache.derby.iapi.error.StandardException The wait for the lock timed out (message id will be LockFactory.TimeOut).
-		@exception org.apache.derby.iapi.error.StandardException Another thread interupted this thread while
-		it was waiting for the lock. This will be a StandardException with a nested java.lang.InterruptedException exception,
-		(message id will be LockFactory.InterruptedExceptionId)
-		@exception StandardException Standard Derby error policy.
-
+        @exception StandardException if a deadlock has occurred (message id
+            will be LockFactory.Deadlock), or if the wait for the lock timed
+            out (message id will be LockFactory.TimeOut), or if another thread
+            interrupted this thread while it was waiting for the lock (this will
+            be a StandardException with a nested InterruptedException, and the
+            message id will be LockFactory.InterruptedExceptionId), or if
+            any other error occurs when locking the object
 	*/
 	public boolean zeroDurationlockObject(CompatibilitySpace compatibilitySpace,
 										  Lockable ref, Object qualifier,

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/services/monitor/PersistentService.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/services/monitor/PersistentService.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/services/monitor/PersistentService.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/services/monitor/PersistentService.java Mon Sep 16 19:05:14 2013
@@ -178,7 +178,8 @@ public interface PersistentService {
 		Convert a service name into its canonical form. Returns null if the name
 		cannot be converted into a canonical form.
 		
-		@exception No canonical name, name probably invalid
+		@exception StandardException if an error happens when converting the
+        name (name probably invalid)
 	*/
 	public String getCanonicalServiceName(String name)
 		throws StandardException;

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/sql/ResultColumnDescriptor.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/sql/ResultColumnDescriptor.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/sql/ResultColumnDescriptor.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/sql/ResultColumnDescriptor.java Mon Sep 16 19:05:14 2013
@@ -68,7 +68,7 @@ public interface ResultColumnDescriptor
 	 * @return	A String containing the name of the base table of the Column
 	 *		is in. If the column is not in a table (i.e. is a
 	 * 		derived column), it returns NULL.
-	 * @return	The name of the Column's base table. If the column
+	 * The name of the Column's base table. If the column
 	 *		is not in a schema (i.e. is a derived column), it returns NULL.
 	 */
 	String	getSourceTableName();

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/sql/compile/TypeCompilerFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/sql/compile/TypeCompilerFactory.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/sql/compile/TypeCompilerFactory.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/sql/compile/TypeCompilerFactory.java Mon Sep 16 19:05:14 2013
@@ -36,8 +36,6 @@ public interface TypeCompilerFactory
 	 * Get a TypeCompiler corresponding to the given TypeId.
 	 *
 	 * @return	A TypeCompiler
-	 *
-	 * @exception StandardException		Thrown on failure
 	 */
 	public TypeCompiler getTypeCompiler(TypeId typeId);
 }

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/sql/conn/Authorizer.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/sql/conn/Authorizer.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/sql/conn/Authorizer.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/sql/conn/Authorizer.java Mon Sep 16 19:05:14 2013
@@ -142,7 +142,6 @@ public interface Authorizer
 	 Refresh this authorizer to reflect a change in the database
 	 permissions.
 	 
-	 @exception AuthorizerSessionException Connect permission gone.
 	 @exception StandardException Oops.
 	 */
    public void refresh() throws StandardException;  

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/sql/conn/LanguageConnectionContext.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/sql/conn/LanguageConnectionContext.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/sql/conn/LanguageConnectionContext.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/sql/conn/LanguageConnectionContext.java Mon Sep 16 19:05:14 2013
@@ -565,8 +565,6 @@ public interface LanguageConnectionConte
 	 * which we compile against.
 	 *
 	 * @return the compiler context
-	 *
-	 * @exception StandardException thrown on failure
 	 */
 	public	CompilerContext pushCompilerContext();
 
@@ -578,8 +576,6 @@ public interface LanguageConnectionConte
 	 * @param sd the default schema 
 	 *
 	 * @return the compiler context
-	 *
-	 * @exception StandardException thrown on failure
 	 */
 	public	CompilerContext pushCompilerContext(SchemaDescriptor sd);
 

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java Mon Sep 16 19:05:14 2013
@@ -1776,7 +1776,7 @@ public interface DataDictionary
 	 * 
 	 * @return  array of row locations, null if table has no autoinc columns.
 	 *
-	 * @exception standard exception on error.
+	 * @exception StandardException standard exception on error.
 	 */
 	public RowLocation[] computeAutoincRowLocations(TransactionController tc,
 											   TableDescriptor td)

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/sql/dictionary/TableDescriptor.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/sql/dictionary/TableDescriptor.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/sql/dictionary/TableDescriptor.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/sql/dictionary/TableDescriptor.java Mon Sep 16 19:05:14 2013
@@ -1147,8 +1147,6 @@ public class TableDescriptor extends Tup
 	 * for the table.
 	 *
 	 * @return	A ConglomerateDescriptor[] for looping through the table's conglomerates
-	 *
-	 * @exception StandardException		Thrown on failure
 	 */
 	public ConglomerateDescriptor[]	getConglomerateDescriptors()
 	{

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/store/access/FileResource.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/store/access/FileResource.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/store/access/FileResource.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/store/access/FileResource.java Mon Sep 16 19:05:14 2013
@@ -91,7 +91,7 @@ public interface FileResource {
      * During hard upgrade to >= 10.9, remove a jar directory (at post-commit 
      * time) from the database.
      * @param f
-     * @exception standard error policy
+     * @exception StandardException standard error policy
      */
     public void removeJarDir(String f) throws StandardException;
     

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/store/access/conglomerate/Conglomerate.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/store/access/conglomerate/Conglomerate.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/store/access/conglomerate/Conglomerate.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/store/access/conglomerate/Conglomerate.java Mon Sep 16 19:05:14 2013
@@ -163,8 +163,6 @@ public interface Conglomerate extends St
      * containerid.
      *
 	 * @return The containerid.
-     *
-	 * @exception  StandardException  Standard exception policy.
      **/
     long getContainerid();
 
@@ -176,8 +174,6 @@ public interface Conglomerate extends St
      * and segment id.
      *
 	 * @return The ContainerKey.
-     *
-	 * @exception  StandardException  Standard exception policy.
      **/
     ContainerKey getId();
 

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/store/raw/ContainerHandle.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/store/raw/ContainerHandle.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/store/raw/ContainerHandle.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/store/raw/ContainerHandle.java Mon Sep 16 19:05:14 2013
@@ -189,7 +189,6 @@ public interface ContainerHandle 
 
 		@see Page#unlatch
 
-		@exception StandardException	Standard Derby error policy
 		@exception StandardException If a page could not be allocated.
 	*/
 	public Page addPage() throws StandardException;

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/store/raw/FetchDescriptor.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/store/raw/FetchDescriptor.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/store/raw/FetchDescriptor.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/store/raw/FetchDescriptor.java Mon Sep 16 19:05:14 2013
@@ -114,8 +114,6 @@ public final class FetchDescriptor
      * parameters work together to describe a "row".
      *
 	 * @return The column list bit map.
-     *
-	 * @exception  StandardException  Standard exception policy.
      **/
     public final FormatableBitSet getValidColumns()
     {
@@ -158,8 +156,6 @@ public final class FetchDescriptor
      * A null qualifier array means there are no qualifiers.
      *
 	 * @return The qualifier array, it may be null.
-     *
-	 * @exception  StandardException  Standard exception policy.
      **/
     public final Qualifier[][] getQualifierList()
     {

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/store/raw/Page.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/store/raw/Page.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/store/raw/Page.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/store/raw/Page.java Mon Sep 16 19:05:14 2013
@@ -133,8 +133,6 @@ public interface Page  
      * <p>
      *
 	 * @return an invalid record handle.
-     *
-	 * @exception  StandardException  Standard exception policy.
      **/
 	public RecordHandle getInvalidRecordHandle();
 
@@ -268,9 +266,8 @@ public interface Page  
      *
      * @return A RecordHandle representing the new record.
      *
-     * @exception StandardException	Standard Derby error policy
-     * @exception StandardException The container was not opened in update mode.
-     * @exception StandardException Row cannot fit on the page or row is null.
+     * @exception StandardException	if the container was not opened in update
+     * mode, or if the row cannot fit on the page, or if the row is null
      **/
 	RecordHandle insert(
     Object[]            row, 
@@ -485,9 +482,8 @@ public interface Page  
      * @return A RecordHandle representing the new record, or null if the row 
      *         will not fit on a non-empty page.
      *
-     * @exception StandardException	Standard Derby error policy
-     * @exception StandardException The container was not opened in update mode.
-     * @exception StandardException The row cannot fit on the page
+     * @exception StandardException	if the container was not opened in update
+     * mode, or if the row cannot fit on the page, or if the row is null
      *
      * @see LogicalUndo
      * @see LogicalUndoable
@@ -723,7 +719,8 @@ public interface Page  
 		                                the slot is not on the page, or if the 
                                         record is deleted, or if the fieldId 
                                         is not on the record and (fieldId - 1)
-                                        does not exist.
+                                        does not exist, or if the container was
+                                        not opened in update mode.
 
 		@exception StandardException 
 		The container was not opened in update mode.
@@ -787,15 +784,10 @@ public interface Page  
      *                  the access code where the logical undo logic resides.
      *                  Null if logical undo is not necessary.
      * 
-     * @exception StandardException	Standard Derby error policy
-     * @exception StandardException The container was not opened in update mode.
-     * @exception StandardException A statement level exception is thrown when 
-     *                              trying to delete an already deleted record,
-     *                              or undelete a not deleted record.
-     *
-     * @exception StandardException A statement level exception is thrown if 
-     *                              the slot is not on the page.
-     *
+     * @exception StandardException if the container was not opened in update
+     * mode, or if an attempt was made to delete an already deleted record or
+     * undelete a not deleted record, or if the slot is not on the page     *
+     * 
      * @see LockingPolicy
      * @see LogicalUndo
      * @see LogicalUndoable
@@ -947,9 +939,8 @@ public interface Page  
 		@param validColumns a bit map of which columns in the row is valid.
 		ValidColumns will not be changed by RawStore.
 
-		@exception StandardException	Standard Derby error policy
-		@exception StandardException The container was not opened in update mode.
-		@exception StandardException if the slot is not on the page.
+		@exception StandardException the container was not opened in update
+		    mode, or the slot is not on the page
 
 	*/
 	RecordHandle updateAtSlot(

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/store/raw/Transaction.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/store/raw/Transaction.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/store/raw/Transaction.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/store/raw/Transaction.java Mon Sep 16 19:05:14 2013
@@ -162,7 +162,7 @@ public interface Transaction {
         transaction is then aborted and then an exception of Transaction
 		severity is thrown nesting the original exception.
 
-		@exception StandardException Any exception more severe than a
+		Any exception more severe than a
         Transaction exception is not caught and the transaction is not aborted.
         The transaction will be aborted by the standard context mechanism.
 
@@ -187,7 +187,7 @@ public interface Transaction {
         transaction is then aborted and then an exception of Transaction
 		severity is thrown nesting the original exception.
 
-		@exception StandardException Any exception more severe than a
+		Any exception more severe than a
         Transaction exception is not caught and the transaction is not aborted.
         The transaction will be aborted by the standard context mechanism.
 	*/
@@ -215,7 +215,6 @@ public interface Transaction {
 
 		@see RawStoreFactory#startTransaction
 
-		@exception StandardException Standard Derby error policy
 		@exception StandardException A transaction level exception is 
         thrown if the transaction is not idle.
 
@@ -228,7 +227,6 @@ public interface Transaction {
 
 		@see RawStoreFactory#startTransaction
 
-		@exception StandardException Standard Derby error policy
 		@exception StandardException A transaction level exception is 
         thrown if the transaction is not idle.
 
@@ -251,7 +249,6 @@ public interface Transaction {
                     A JDBC Savepoint object value for kindOfSavepoint would mean it is JDBC savepoint
 
 		@return returns total number of savepoints in the stack.
-		@exception StandardException  Standard Derby exception policy
 		@exception StandardException
         A statement level exception is thrown if a savepoint already 
         exists in the current transaction with the same name.
@@ -272,7 +269,6 @@ public interface Transaction {
                     A JDBC Savepoint object value for kindOfSavepoint would mean it is JDBC savepoint
 
 		@return returns total number of savepoints in the stack.
-		@exception StandardException  Standard Derby exception policy
 		@exception StandardException
         A statement level exception is thrown if a savepoint already
         exists in the current transaction with the same name.
@@ -295,7 +291,6 @@ public interface Transaction {
                     A JDBC Savepoint object value for kindOfSavepoint would mean it is JDBC savepoint
 
 		@return returns total number of savepoints in the stack.
-		@exception StandardException  Standard Derby exception policy
 		@exception StandardException
         A statement level exception is thrown if no savepoint exists with 
         the given name.

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/types/HarmonySerialBlob.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/types/HarmonySerialBlob.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/types/HarmonySerialBlob.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/types/HarmonySerialBlob.java Mon Sep 16 19:05:14 2013
@@ -57,8 +57,7 @@ public class HarmonySerialBlob implement
      * @param blob
      *            the given blob
      * @throws SQLException
-     *             if an error is encountered during serialization
-     * @throws SQLException
+     *             if an error is encountered during serialization, or
      *             if <code>blob</code> is null
      */
     public HarmonySerialBlob(Blob blob) throws SQLException {
@@ -76,8 +75,7 @@ public class HarmonySerialBlob implement
      * @param buf
      *            the given buffer
      * @throws SQLException
-     *             if an error is encountered during serialization
-     * @throws SQLException
+     *             if an error is encountered during serialization, or
      *             if a SQL error is encountered
      */
     public HarmonySerialBlob(byte[] buf) {
@@ -154,8 +152,7 @@ public class HarmonySerialBlob implement
      * @return a long value with the position at which the pattern begins. -1 if
      *         the pattern is not found in this Blob.
      * @throws SQLException
-     *             if an error occurs accessing the Blob
-     * @throws SQLException
+     *             if an error occurs accessing the Blob, or
      *             if an error is encountered
      */
     public long position(Blob pattern, long start) throws SQLException {
@@ -176,8 +173,7 @@ public class HarmonySerialBlob implement
      * @return a long value with the position at which the pattern begins. -1 if
      *         the pattern is not found in this Blob.
      * @throws SQLException
-     *             if an error is encountered
-     * @throws SQLException
+     *             if an error is encountered, or
      *             if an error occurs accessing the Blob
      */
     public long position(byte[] pattern, long start) throws SQLException {

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/types/PositionedStream.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/types/PositionedStream.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/types/PositionedStream.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/types/PositionedStream.java Mon Sep 16 19:05:14 2013
@@ -58,7 +58,7 @@ public interface PositionedStream {
      *
      * @param requestedPos requested byte position, first position is {@code 0}
      * @throws IOException if accessing the stream fails
-     * @throws EOFException if the requested position is equal to or larger
+     * @throws java.io.EOFException if the requested position is equal to or larger
      *      than the length of the stream
      * @throws StandardException if an error occurs in store
      */

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/types/SQLChar.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/types/SQLChar.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/types/SQLChar.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/types/SQLChar.java Mon Sep 16 19:05:14 2013
@@ -886,9 +886,6 @@ public class SQLChar
         @exception  IOException  if an I/O error occurs.
         @since      JDK1.0
 
-
-      @exception IOException thrown by writeUTF
-
       @see java.io.DataInputStream
 
     */

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/types/SQLDate.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/types/SQLDate.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/types/SQLDate.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/types/SQLDate.java Mon Sep 16 19:05:14 2013
@@ -377,7 +377,8 @@ public final class SQLDate extends DataT
      * @param isJdbcEscape if true then only the JDBC date escape syntax is allowed
      * @param localeFinder
      *
-     * @exception Standard exception if the syntax is invalid or the value is out of range.
+     * @exception StandardException if the syntax is invalid or the value 
+     *     is out of range.
      */
     public SQLDate( String dateStr, boolean isJdbcEscape, LocaleFinder localeFinder)
         throws StandardException
@@ -398,7 +399,8 @@ public final class SQLDate extends DataT
      * @param isJdbcEscape if true then only the JDBC date escape syntax is allowed
      * @param localeFinder
      *
-     * @exception Standard exception if the syntax is invalid or the value is out of range.
+     * @exception StandardException if the syntax is invalid or the value 
+     *     is out of range.
      */
     public SQLDate( String dateStr, boolean isJdbcEscape, LocaleFinder localeFinder, Calendar cal)
         throws StandardException

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/types/SQLLongint.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/types/SQLLongint.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/types/SQLLongint.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/types/SQLLongint.java Mon Sep 16 19:05:14 2013
@@ -333,8 +333,6 @@ public final class SQLLongint
 
 	/**
 	 * @see NumberDataValue#setValue
-	 *
-	 * @exception StandardException		Thrown on error
 	 */
 	public final void setValue(Number theValue)
 	{
@@ -850,8 +848,6 @@ public final class SQLLongint
      * This method implements the isNegative method.
      *
      * @return  A boolean.  if this.value is negative, return true.
-     *
-     * @exception StandException       Thrown on error
      */
     
     protected boolean isNegative()

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/types/SQLTime.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/types/SQLTime.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/types/SQLTime.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/types/SQLTime.java Mon Sep 16 19:05:14 2013
@@ -384,7 +384,8 @@ public final class SQLTime extends DataT
      *<li>JIS & current ISO: hh:mm[:ss]
      *</ol>
      * 
-     * @exception Standard exception if the syntax is invalid or the value is out of range.
+     * @exception StandardException if the syntax is invalid or the value is
+     *     out of range.
      */
     public SQLTime( String timeStr, boolean isJdbcEscape, LocaleFinder localeFinder)
         throws StandardException
@@ -400,7 +401,8 @@ public final class SQLTime extends DataT
      *<li>JIS & current ISO: hh:mm[:ss]
      *</ol>
      * 
-     * @exception Standard exception if the syntax is invalid or the value is out of range.
+     * @exception StandardException if the syntax is invalid or the value is
+     *     out of range.
      */
     public SQLTime( String timeStr, boolean isJdbcEscape, LocaleFinder localeFinder, Calendar cal)
         throws StandardException

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/types/XML.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/types/XML.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/types/XML.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/types/XML.java Mon Sep 16 19:05:14 2013
@@ -849,8 +849,7 @@ public class XML
      *  version of the results from evaluation of the query expression.
      *  Note: this XMLDataValue may not be storable into Derby XML
      *  columns.
-     * @exception Exception thrown on error (and turned into a
-     *  StandardException by the caller).
+     * @exception StandardException thrown on error
      */
     public XMLDataValue XMLQuery(SqlXmlUtil sqlxUtil, XMLDataValue result)
             throws StandardException

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/types/XMLDataValue.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/types/XMLDataValue.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/types/XMLDataValue.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/iapi/types/XMLDataValue.java Mon Sep 16 19:05:14 2013
@@ -101,8 +101,7 @@ public interface XMLDataValue extends Da
      *  version of the results from evaluation of the query expression.
      *  Note: this XMLDataValue may not be storable into Derby XML
      *  columns.
-     * @exception Exception thrown on error (and turned into a
-     *  StandardException by the caller).
+     * @exception StandardException thrown on error
      */
     public XMLDataValue XMLQuery(SqlXmlUtil sqlxUtil, XMLDataValue result)
 		throws StandardException;

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/jdbc/EmbedConnection40.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/jdbc/EmbedConnection40.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/jdbc/EmbedConnection40.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/jdbc/EmbedConnection40.java Mon Sep 16 19:05:14 2013
@@ -238,7 +238,7 @@ public class EmbedConnection40
      *
      * @param  interfaces a Class defining an interface
      * @return an object that implements the interface
-     * @throws java.sql.SQLExption if no object if found that implements the 
+     * @throws SQLException if no object if found that implements the 
      * interface
      */
     public <T> T unwrap(java.lang.Class<T> interfaces) 

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java Mon Sep 16 19:05:14 2013
@@ -1019,13 +1019,8 @@ public class EmbedPreparedStatement
      *  ignored if the parameter is not a user-defined type or REF
      * @exception SQLException if a database access error occurs or
      * this method is called on a closed <code>PreparedStatement</code>
-     * @exception SQLFeatureNotSupportedException if <code>sqlType</code> is
-     * a <code>ARRAY</code>, <code>BLOB</code>, <code>CLOB</code>,
-     * <code>DATALINK</code>, <code>JAVA_OBJECT</code>, <code>NCHAR</code>,
-     * <code>NCLOB</code>, <code>NVARCHAR</code>, <code>LONGNVARCHAR</code>,
-     *  <code>REF</code>, <code>ROWID</code>, <code>SQLXML</code>
-     * or  <code>STRUCT</code> data type and the JDBC driver does not support
-     * this data type or if the JDBC driver does not support this method
+     * @exception SQLFeatureNotSupportedException if Derby does not
+     *   support the type specified in the {@code sqlType} parameter
      *
      */
     public void setNull(int paramIndex,

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement40.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement40.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement40.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement40.java Mon Sep 16 19:05:14 2013
@@ -97,7 +97,7 @@ public class EmbedPreparedStatement40 ex
      *
      * @param  interfaces a Class defining an interface
      * @return an object that implements the interface
-     * @throws java.sql.SQLExption if no object if found that implements the 
+     * @throws SQLException if no object if found that implements the 
      * interface
      */
     public <T> T unwrap(java.lang.Class<T> interfaces) 

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet40.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet40.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet40.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet40.java Mon Sep 16 19:05:14 2013
@@ -184,7 +184,7 @@ public class EmbedResultSet40 extends or
      *
      * @param  interfaces a Class defining an interface
      * @return an object that implements the interface
-     * @throws java.sql.SQLExption if no object if found that implements the 
+     * @throws SQLException if no object if found that implements the 
      * interface
      */
     public <T> T unwrap(java.lang.Class<T> interfaces) 

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/jdbc/EmbedResultSetMetaData40.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/jdbc/EmbedResultSetMetaData40.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/jdbc/EmbedResultSetMetaData40.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/jdbc/EmbedResultSetMetaData40.java Mon Sep 16 19:05:14 2013
@@ -60,7 +60,7 @@ public class EmbedResultSetMetaData40 ex
      *
      * @param  interfaces a Class defining an interface
      * @return an object that implements the interface
-     * @throws java.sql.SQLExption if no object if found that implements the 
+     * @throws SQLException if no object if found that implements the 
      * interface
      */
    public <T> T unwrap(java.lang.Class<T> interfaces) 

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/jdbc/EmbedStatement40.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/jdbc/EmbedStatement40.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/jdbc/EmbedStatement40.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/jdbc/EmbedStatement40.java Mon Sep 16 19:05:14 2013
@@ -65,7 +65,7 @@ public class EmbedStatement40 extends Em
      *
      * @param  interfaces a Class defining an interface
      * @return an object that implements the interface
-     * @throws java.sql.SQLExption if no object if found that implements the 
+     * @throws SQLException if no object if found that implements the 
      * interface
      */
     public <T> T unwrap(java.lang.Class<T> interfaces)

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/load/Export.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/load/Export.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/load/Export.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/load/Export.java Mon Sep 16 19:05:14 2013
@@ -174,7 +174,7 @@ public class Export extends ExportAbstra
 	 * @param columnDelimeter  Delimiter that seperates columns in the output file
 	 * @param characterDelimeter  Delimiter that is used to quoate non-numeric types
 	 * @param codeset           Codeset that should be used to write  the data to  the file
- 	 * @exception SQL Exception on errors
+ 	 * @exception SQLException on errors
 	 */
 
 	public static void exportTable(Connection con, String schemaName, 
@@ -211,7 +211,7 @@ public class Export extends ExportAbstra
      *                           write the data to the file/
      * @param lobsFileName       Name of the file to which large object 
      *                           data has to be exported.
-     * @exception SQL Exception on errors
+     * @exception SQLException on errors
      */
 
     public static void exportTable(Connection con, String schemaName, 
@@ -238,7 +238,7 @@ public class Export extends ExportAbstra
 	 * @param columnDelimeter  Delimiter that seperates columns in the output file
 	 * @param characterDelimeter  Delimiter that is used to quiote non-numeric types
 	 * @param codeset           Codeset that should be used to write  the data to  the file
- 	 * @exception SQL Exception on errors
+ 	 * @exception SQLException on errors
 	 */
 	public static void exportQuery(Connection con, String selectStatement,
 							  String outputFileName, String columnDelimeter, 
@@ -270,7 +270,7 @@ public class Export extends ExportAbstra
      * @param codeset Codeset that should be used to write the data to the file
      * @param lobsFileName Name of the file to which 
      *                     large object data has to be exported.
-     * @exception SQL Exception on errors
+     * @exception SQLException on errors
      */
     public static void exportQuery(Connection con, String selectStatement,
                                    String outputFileName, String columnDelimeter, 

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/load/Import.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/load/Import.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/load/Import.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/load/Import.java Mon Sep 16 19:05:14 2013
@@ -58,7 +58,7 @@ public class Import extends ImportAbstra
 	/**
 	 * Constructior to Invoke Import from a select statement 
 	 * @param inputFileName	 The URL of the ASCII file from which import will happen
-	 * @exception Exception on error 
+	 * @exception SQLException on error 
 	 */
 	public Import(String inputFileName, String columnDelimiter,
                   String characterDelimiter,  String codeset, 
@@ -112,7 +112,7 @@ public class Import extends ImportAbstra
 	 *                         appended.(0 - append , > 0 Replace the data)
      * @param lobsInExtFile true, if the lobs data is stored in an external file,
      *                      and the reference to it is stored in the main import file.
- 	 * @exception SQL Exception on errors
+ 	 * @exception SQLException on errors
 	 */
 
 	public static void importTable(Connection connection, String schemaName, 
@@ -150,7 +150,7 @@ public class Import extends ImportAbstra
 	 *                         appended.(0 - append , > 0 Replace the data)
      * @param lobsInExtFile true, if the lobs data is stored in an external file,
      *                      and the reference is stored in the main import file.
- 	 * @exception SQL Exception on errors
+ 	 * @exception SQLException on errors
 	 */
 	public static void importData(Connection connection, String schemaName,
                                   String tableName, String insertColumnList, 

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionContext.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionContext.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionContext.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionContext.java Mon Sep 16 19:05:14 2013
@@ -2321,8 +2321,6 @@ public class GenericLanguageConnectionCo
      * which we compile against.
      *
      * @return the compiler context
-     *
-     * @exception StandardException thrown on failure
      */
     public  final CompilerContext pushCompilerContext()
     {

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/store/access/UTFQualifier.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/store/access/UTFQualifier.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/store/access/UTFQualifier.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/store/access/UTFQualifier.java Mon Sep 16 19:05:14 2013
@@ -49,8 +49,6 @@ public class UTFQualifier implements Qua
 
 	/**
 	 * Get the value that the column is to be compared to.
-	 *
-	 * @exception StandardException		Thrown on error
 	 */
 	public DataValueDescriptor getOrderable() {
 		return value;

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/store/access/btree/ControlRow.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/store/access/btree/ControlRow.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/store/access/btree/ControlRow.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/store/access/btree/ControlRow.java Mon Sep 16 19:05:14 2013
@@ -1218,8 +1218,6 @@ public abstract class ControlRow impleme
 	@param partialKeyOrder what to return on a partial key match.
 	@param ascOrDesc column sort order information
 	@throws StandardException if lower levels have a problem.
-
-    @exception StandardException Standard exception policy.
 	**/
 	public static int compareIndexRowFromPageToKey(
     ControlRow              indexpage,

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/store/access/conglomerate/OpenConglomerateScratchSpace.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/store/access/conglomerate/OpenConglomerateScratchSpace.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/store/access/conglomerate/OpenConglomerateScratchSpace.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/store/access/conglomerate/OpenConglomerateScratchSpace.java Mon Sep 16 19:05:14 2013
@@ -225,8 +225,6 @@ public class OpenConglomerateScratchSpac
      * <p>
      *
 	 * @return a scratch RowPosition.
-     *
-	 * @exception  StandardException  Standard exception policy.
      **/
     public RowPosition get_scratch_row_position()
     {

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/store/raw/data/AllocExtent.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/store/raw/data/AllocExtent.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/store/raw/data/AllocExtent.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/store/raw/data/AllocExtent.java Mon Sep 16 19:05:14 2013
@@ -602,8 +602,6 @@ public class AllocExtent implements Exte
      * 1) the truncate of pages greater than new_highest_page happened before
      *    the abort took place.  W
      * 2) 
-     *
-	 * @exception  StandardException  Standard exception policy.
      **/
     protected void undoCompressPages(
     int        new_highest_page,
@@ -766,8 +764,6 @@ public class AllocExtent implements Exte
      * <p>
      *
 	 * @return The page number of this "bit" in the extent map.
-     *
-	 * @exception  StandardException  Standard exception policy.
      **/
     protected long getPagenum(int bit_pos)
     {

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/store/raw/data/StoredFieldHeader.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/store/raw/data/StoredFieldHeader.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/store/raw/data/StoredFieldHeader.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/store/raw/data/StoredFieldHeader.java Mon Sep 16 19:05:14 2013
@@ -396,7 +396,7 @@ public final class StoredFieldHeader
      * @param offset    the offset in the array where the field begin, ie. 
      *                  the status byte is at data[offset].
      *
-	 * @exception  StandardException  Standard exception policy.
+	 * @exception  IOException  if an I/O error occurs
      **/
 	public static final int readTotalFieldLength(
     byte[]      data,

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/store/raw/data/StoredPage.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/store/raw/data/StoredPage.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/store/raw/data/StoredPage.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/store/raw/data/StoredPage.java Mon Sep 16 19:05:14 2013
@@ -1374,8 +1374,6 @@ public class StoredPage extends CachedPa
      *
      * @return true if the record will fit on this page, after being given a
      *         new record id as the next id on this page.
-     *
-     * @exception  StandardException  Standard exception policy.
      **/
     protected boolean spaceForCopy(
     int spaceNeeded, 
@@ -2538,8 +2536,6 @@ public class StoredPage extends CachedPa
      * @return The record header for the specific slot.
      *
      * @param slot   return record header of this slot.
-     *
-     * @exception  StandardException  Standard exception policy.
      **/
     public StoredRecordHeader recordHeaderOnDemand(int slot)
     {

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/store/raw/data/StoredRecordHeader.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/store/raw/data/StoredRecordHeader.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/store/raw/data/StoredRecordHeader.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/store/raw/data/StoredRecordHeader.java Mon Sep 16 19:05:14 2013
@@ -304,8 +304,6 @@ public final class StoredRecordHeader
      * rows, so calls to CompressNumber have been hand inlined.
      *
      * @return The length of the record header.
-     *
-     * @exception  StandardException  Standard exception policy.
      **/
     public int size() 
     {

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/store/raw/data/StreamFileContainer.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/store/raw/data/StreamFileContainer.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/store/raw/data/StreamFileContainer.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/store/raw/data/StreamFileContainer.java Mon Sep 16 19:05:14 2013
@@ -311,8 +311,6 @@ public class StreamFileContainer impleme
      * <p>
      * Close this stream file, and all streams associated with it.
      * <p>
-     *
-	 * @exception  StandardException  Standard exception policy.
      **/
 	protected void close()
     {

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/store/raw/xact/Xact.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/store/raw/xact/Xact.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/store/raw/xact/Xact.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/store/raw/xact/Xact.java Mon Sep 16 19:05:14 2013
@@ -1125,7 +1125,6 @@ public class Xact extends RawTransaction
     }
 
 	/**
-	    @exception StandardException  Standard Derby exception policy
 		@exception StandardException Thrown if the transaction is not idle, the
 		transaction remains open.
 		@see Transaction#close
@@ -2199,7 +2198,6 @@ public class Xact extends RawTransaction
 		otherwise it is left in the stack (at the top).
 
 		@return true if any work is rolled back, false if no work is rolled back
-		@exception StandardException	Standard Derby policy
 		@exception StandardException Thrown if a error of severity less than TransactionException#SEVERITY
 		is encountered during the rollback of this savepoint.
 	*/

Modified: db/derby/code/branches/10.10/java/engine/org/apache/derby/io/StorageRandomAccessFile.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/engine/org/apache/derby/io/StorageRandomAccessFile.java?rev=1523762&r1=1523761&r2=1523762&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/engine/org/apache/derby/io/StorageRandomAccessFile.java (original)
+++ db/derby/code/branches/10.10/java/engine/org/apache/derby/io/StorageRandomAccessFile.java Mon Sep 16 19:05:14 2013
@@ -99,7 +99,7 @@ public interface StorageRandomAccessFile
      * does not survive a restart, then the sync method implementation need not do anything.
      *
      *
-     * @exception SyncFailedException if a possibly recoverable error occurs.
+     * @exception java.io.SyncFailedException if a possibly recoverable error occurs.
      * @exception IOException If an IO error occurs.
      */
     public void sync() throws IOException;



Mime
View raw message