db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r1071318 - in /db/derby/code/trunk/java: build/org/apache/derbyBuild/ client/org/apache/derby/client/am/ client/org/apache/derby/client/net/ drda/org/apache/derby/impl/drda/ engine/org/apache/derby/impl/sql/catalog/ engine/org/apache/derby/...
Date Wed, 16 Feb 2011 17:25:41 GMT
Author: kahatlen
Date: Wed Feb 16 17:25:40 2011
New Revision: 1071318

URL: http://svn.apache.org/viewvc?rev=1071318&view=rev
Log:
DERBY-5018: remove erroneous throws clauses on non derivable methods that don't throw

Patch contributed by Dave Brosius <dbrosius@apache.org>.

Modified:
    db/derby/code/trunk/java/build/org/apache/derbyBuild/ElementFacade.java
    db/derby/code/trunk/java/client/org/apache/derby/client/am/CallableStatement.java
    db/derby/code/trunk/java/client/org/apache/derby/client/am/Cursor.java
    db/derby/code/trunk/java/client/org/apache/derby/client/am/PreparedStatement.java
    db/derby/code/trunk/java/client/org/apache/derby/client/am/ResultSet.java
    db/derby/code/trunk/java/client/org/apache/derby/client/am/Statement.java
    db/derby/code/trunk/java/client/org/apache/derby/client/net/NetCallableStatement.java
    db/derby/code/trunk/java/client/org/apache/derby/client/net/Reply.java
    db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/PiggyBackedSessionData.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromBaseTable.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MultiProbeTableScanResultSet.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StreamFileContainer.java

Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/ElementFacade.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/ElementFacade.java?rev=1071318&r1=1071317&r2=1071318&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/ElementFacade.java (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/ElementFacade.java Wed Feb 16 17:25:40
2011
@@ -32,9 +32,8 @@ public class ElementFacade {
     /**
      * Construct a new ElementFacade from an Element.
      * @param r - the Element to wrap
-     * @throws java.lang.Exception
      */
-    public ElementFacade(Element r) throws Exception {
+    public ElementFacade(Element r) {
         root = r;
     }
 

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/CallableStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/CallableStatement.java?rev=1071318&r1=1071317&r2=1071318&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/CallableStatement.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/CallableStatement.java Wed
Feb 16 17:25:40 2011
@@ -167,7 +167,7 @@ public class CallableStatement extends P
         registerOutParameterX(parameterIndex, jdbcType, scale);
     }
 
-    private int guessScaleForDecimalOrNumeric(int parameterIndex) throws SqlException {
+    private int guessScaleForDecimalOrNumeric(int parameterIndex) {
         // Types.DECIMAL with no supplied scale will use the scale supplied by the setter
method if input BigDecimal is not null
         if (parameterMetaData_.types_[parameterIndex - 1] == Types.DECIMAL &&
                 parameters_[parameterIndex - 1] != null) {

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/Cursor.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/Cursor.java?rev=1071318&r1=1071317&r2=1071318&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/Cursor.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/Cursor.java Wed Feb 16 17:25:40
2011
@@ -1386,7 +1386,7 @@ public abstract class Cursor {
         charBuffer_ = new char[maxCharLength];
     }
 
-    private final String getStringWithoutConvert(int position, int actualLength) throws SqlException
{
+    private final String getStringWithoutConvert(int position, int actualLength) {
         int start = position;
         int end = position + actualLength;
 

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/PreparedStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/PreparedStatement.java?rev=1071318&r1=1071317&r2=1071318&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/PreparedStatement.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/PreparedStatement.java Wed
Feb 16 17:25:40 2011
@@ -303,7 +303,7 @@ public class PreparedStatement extends S
     }
 
     private void initPreparedStatement(ColumnMetaData parameterMetaData,
-                                       ColumnMetaData resultSetMetaData) throws SqlException
{
+                                       ColumnMetaData resultSetMetaData) {
         isPreparedStatement_ = true;
         parameterMetaData_ = parameterMetaData;
         resultSetMetaData_ = resultSetMetaData;

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/ResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/ResultSet.java?rev=1071318&r1=1071317&r2=1071318&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/ResultSet.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/ResultSet.java Wed Feb 16 17:25:40
2011
@@ -4247,7 +4247,7 @@ public abstract class ResultSet implemen
         return (isBeforeFirstX() && firstRowInRowset_ == 0 && lastRowInRowset_
== 0 && absolutePosition_ == 0);
     }
 
-    private boolean isServerCursorPositionAfterLast() throws SqlException {
+    private boolean isServerCursorPositionAfterLast() {
         return (absolutePosition_ == (rowCount_ + 1));
     }
 
@@ -4842,7 +4842,7 @@ public abstract class ResultSet implemen
         }
     }
 
-    private boolean rowIsInCurrentRowset(long rowNumber) throws SqlException {
+    private boolean rowIsInCurrentRowset(long rowNumber) {
         // firstRowInRowset_ is equal to lastRowInRowset_ if there is only one row
         // in the rowset or if fetchSize_ is 1.  however, return false if firstRowInRowset_
         // is equal to lastRowInRowset_ and also equal to zero which means there is no
@@ -5142,7 +5142,7 @@ public abstract class ResultSet implemen
         return true;
     }
 
-    private void adjustPreviousRowset(int orientation, long rowNumber, boolean isAfterLastRow)
throws SqlException {
+    private void adjustPreviousRowset(int orientation, long rowNumber, boolean isAfterLastRow)
{
         if (orientation == scrollOrientation_absolute__ && rowNumber == 1) {
             // Subtracting 2 because the currentRowInRowset_ index starts at 0, and all
             // the other indexes starts at 1.

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/Statement.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/Statement.java?rev=1071318&r1=1071317&r2=1071318&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/Statement.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/Statement.java Wed Feb 16 17:25:40
2011
@@ -2525,7 +2525,7 @@ public class Statement implements java.s
         return tokenFound;
     }
 
-    private void parseUpdateSql(String firstToken) throws SqlException {
+    private void parseUpdateSql(String firstToken) {
         sqlMode_ = isUpdate__;
         if (firstToken.equalsIgnoreCase("insert")) {
             sqlUpdateMode_ = isInsertSql__;

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetCallableStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetCallableStatement.java?rev=1071318&r1=1071317&r2=1071318&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetCallableStatement.java
(original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetCallableStatement.java
Wed Feb 16 17:25:40 2011
@@ -59,7 +59,7 @@ public class NetCallableStatement extend
         initNetCallableStatement(statement);
     }
 
-    private void initNetCallableStatement(CallableStatement statement) throws SqlException
{
+    private void initNetCallableStatement(CallableStatement statement) {
         callableStatement_ = statement;
         callableStatement_.materialCallableStatement_ = this;
 

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/Reply.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/Reply.java?rev=1071318&r1=1071317&r2=1071318&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/Reply.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/Reply.java Wed Feb 16 17:25:40
2011
@@ -1413,7 +1413,7 @@ public class Reply {
         return (nullInd == CodePoint.NULLDATA);
     }
 
-    private final int skipSQLDHROW(int offset) throws DisconnectException {
+    private final int skipSQLDHROW(int offset) {
         int sqldhrowgrpNullInd = buffer_[pos_ + offset++] & 0xff;
         if (sqldhrowgrpNullInd == CodePoint.NULLDATA) {
             return offset;

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/PiggyBackedSessionData.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/PiggyBackedSessionData.java?rev=1071318&r1=1071317&r2=1071318&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/PiggyBackedSessionData.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/PiggyBackedSessionData.java Wed
Feb 16 17:25:40 2011
@@ -69,7 +69,7 @@ class PiggyBackedSessionData {
      * the xModified() methods can be used.
      * @param conn the connection to obtain data from
      */
-    private PiggyBackedSessionData(EngineConnection conn) throws SQLException {
+    private PiggyBackedSessionData(EngineConnection conn) {
         conn_ = conn;
         iso_ = -1; // Initialize to an illegal value
     }

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java?rev=1071318&r1=1071317&r2=1071318&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
Wed Feb 16 17:25:40 2011
@@ -9036,7 +9036,6 @@ public final class	DataDictionaryImpl
 	 * Initialized the noncore info array.
 	 */
 	private void initializeNoncoreInfo()
-		throws StandardException
 	{
 		noncoreInfo = new TabInfoImpl[NUM_NONCORE];
 	}

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromBaseTable.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromBaseTable.java?rev=1071318&r1=1071317&r2=1071318&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromBaseTable.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromBaseTable.java Wed
Feb 16 17:25:40 2011
@@ -4559,7 +4559,6 @@ public class FromBaseTable extends FromT
 	}
 
 	private ConglomerateDescriptor getNextConglom(ConglomerateDescriptor currCD)
-		throws StandardException
 	{
 		int index = 0;
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MultiProbeTableScanResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MultiProbeTableScanResultSet.java?rev=1071318&r1=1071317&r2=1071318&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MultiProbeTableScanResultSet.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MultiProbeTableScanResultSet.java
Wed Feb 16 17:25:40 2011
@@ -472,7 +472,6 @@ class MultiProbeTableScanResultSet exten
      * then just return null.
      */
     private DataValueDescriptor getNextProbeValue()
-        throws StandardException
     {
         int ctr = probeValIndex;
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StreamFileContainer.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StreamFileContainer.java?rev=1071318&r1=1071317&r2=1071318&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StreamFileContainer.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StreamFileContainer.java
Wed Feb 16 17:25:40 2011
@@ -168,7 +168,6 @@ public class StreamFileContainer impleme
 	StreamFileContainer(
     ContainerKey        identity, 
     BaseDataFileFactory dataFactory)
-		throws StandardException 
     {
 		this.identity = identity;
 		this.dataFactory = dataFactory;



Mime
View raw message