db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r1301809 - in /db/derby/code/branches/10.5: ./ java/ java/build/org/apache/derbyBuild/ java/client/org/apache/derby/client/am/ java/client/org/apache/derby/client/net/ java/drda/org/apache/derby/impl/drda/ java/engine/org/apache/derby/impl/...
Date Fri, 16 Mar 2012 22:45:36 GMT
Author: kmarsden
Date: Fri Mar 16 22:45:35 2012
New Revision: 1301809

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

Contributed by David Brosius. Merge revision 1071318 from trunk 


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

Propchange: db/derby/code/branches/10.5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 16 22:45:35 2012
@@ -1,4 +1,4 @@
 /db/derby/code/branches/10.6:942027,957000,957287,958621,962738,965351,987678,997790*,1031623,1055601,1068474,1071167
 /db/derby/code/branches/10.7:1294731
 /db/derby/code/branches/10.8:1209227-1209228,1209284
-/db/derby/code/trunk:757811,764912,769596,769602,769606,769962,772090,772337,772449,772534,774281,777105,779681,782991,785131,785139,785163,785570,785662,788369,788670,788674,788968,789264,790218,791027,792001,792254,792434,793089,793588,794106,794276,794303,794955,795166,795459,796020,796027,796316,796372,797147,798347,798742,800523,803336,803548,803948,805696,808494,808850,809643,810860,812669,816531,816536,819006,822289,823659,824694,826263,827505,829022,829410,830545,831304,831319,832379,833430,835286,881074,881444,882732,884163,885421,885659,887246,888311,891350,892912,897161,898635,901165,901648,901760,902857,903108,905224,908418,908586,909176,910481,910511,911315,911793,915177,915733,916075,916897,917771,918152,918359,921028,927430,928065,929085,931076,934474,936215,938959,940462,940469,942286,942476,942480,942587,946794,948045,948069,951346,951366,952138,952237,952581,954748,955001,955634,956075,956445,956659,957260,958163,958618,959550,961892,962716,964039,964402,96
 5647,966393,967201,967304,980089,980684,986689,986834,987539,989099,997325*,998170,999119,999485,1002291,1002682,1002853,1021426,1024511,1024528,1025615,1025795,1030043,1040658,1053724,1055169,1062096,1063809,1065061,1067250,1069661,1071886,1081455,1085078,1136363,1138341,1138444,1140222,1140744,1141924,1203050,1207729,1208775,1293494,1294512
+/db/derby/code/trunk:757811,764912,769596,769602,769606,769962,772090,772337,772449,772534,774281,777105,779681,782991,785131,785139,785163,785570,785662,788369,788670,788674,788968,789264,790218,791027,792001,792254,792434,793089,793588,794106,794276,794303,794955,795166,795459,796020,796027,796316,796372,797147,798347,798742,800523,803336,803548,803948,805696,808494,808850,809643,810860,812669,816531,816536,819006,822289,823659,824694,826263,827505,829022,829410,830545,831304,831319,832379,833430,835286,881074,881444,882732,884163,885421,885659,887246,888311,891350,892912,897161,898635,901165,901648,901760,902857,903108,905224,908418,908586,909176,910481,910511,911315,911793,915177,915733,916075,916897,917771,918152,918359,921028,927430,928065,929085,931076,934474,936215,938959,940462,940469,942286,942476,942480,942587,946794,948045,948069,951346,951366,952138,952237,952581,954748,955001,955634,956075,956445,956659,957260,958163,958618,959550,961892,962716,964039,964402,96
 5647,966393,967201,967304,980089,980684,986689,986834,987539,989099,997325*,998170,999119,999485,1002291,1002682,1002853,1021426,1024511,1024528,1025615,1025795,1030043,1040658,1053724,1055169,1062096,1063809,1065061,1067250,1069661,1071318,1071886,1081455,1085078,1136363,1138341,1138444,1140222,1140744,1141924,1203050,1207729,1208775,1293494,1294512

Propchange: db/derby/code/branches/10.5/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 16 22:45:35 2012
@@ -1,4 +1,4 @@
 /db/derby/code/branches/10.6/java:942027,957000,957287,958621,962738,965351,987678,1031623,1055601,1068474,1071167
 /db/derby/code/branches/10.7/java:1294731
 /db/derby/code/branches/10.8/java:1209227-1209228,1209284
-/db/derby/code/trunk/java:757811,764912,769596,769602,769606,769962,772090,772337,772449,772534,774281,777105,779681,782991,785131,785139,785163,785570,785662,788369,788670,788674,788968,789264,790218,791027,792001,792254,792434,793089,793588,794106,794276,794303,794955,795166,795459,796020,796027,796316,796372,797147,798347,798742,800523,803336,803548,803948,805696,808494,808850,809643,810860,812669,816531,816536,819006,822289,823659,824694,826263,827505,829022,829410,830545,831304,831319,832379,833430,835286,881074,881444,882732,884163,885421,885659,887246,888311,891350,892912,897161,898635,901165,901648,901760,902857,903108,905224,908418,908586,909176,910481,910511,911315,911793,915177,915733,916075,916897,917771,918152,918359,921028,927430,928065,929085,931076,934474,936215,938959,940462,940469,942286,942476,942480,942587,946794,948045,948069,951346,951366,952138,952237,952581,954748,955001,955634,956075,956445,956659,957260,958163,958618,959550,961892,962716,964039,9644
 02,965647,966393,967201,967304,980089,980684,986689,986834,987539,989099,998170,999119,999485,1002291,1002682,1002853,1021426,1024511,1024528,1025615,1025795,1030043,1040658,1053724,1055169,1062096,1063809,1065061,1067250,1069661,1071886,1081455,1085078,1136363,1138341,1138444,1140744,1141924,1294512
+/db/derby/code/trunk/java:757811,764912,769596,769602,769606,769962,772090,772337,772449,772534,774281,777105,779681,782991,785131,785139,785163,785570,785662,788369,788670,788674,788968,789264,790218,791027,792001,792254,792434,793089,793588,794106,794276,794303,794955,795166,795459,796020,796027,796316,796372,797147,798347,798742,800523,803336,803548,803948,805696,808494,808850,809643,810860,812669,816531,816536,819006,822289,823659,824694,826263,827505,829022,829410,830545,831304,831319,832379,833430,835286,881074,881444,882732,884163,885421,885659,887246,888311,891350,892912,897161,898635,901165,901648,901760,902857,903108,905224,908418,908586,909176,910481,910511,911315,911793,915177,915733,916075,916897,917771,918152,918359,921028,927430,928065,929085,931076,934474,936215,938959,940462,940469,942286,942476,942480,942587,946794,948045,948069,951346,951366,952138,952237,952581,954748,955001,955634,956075,956445,956659,957260,958163,958618,959550,961892,962716,964039,9644
 02,965647,966393,967201,967304,980089,980684,986689,986834,987539,989099,998170,999119,999485,1002291,1002682,1002853,1021426,1024511,1024528,1025615,1025795,1030043,1040658,1053724,1055169,1062096,1063809,1065061,1067250,1069661,1071318,1071886,1081455,1085078,1136363,1138341,1138444,1140744,1141924,1294512

Modified: db/derby/code/branches/10.5/java/build/org/apache/derbyBuild/ElementFacade.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/java/build/org/apache/derbyBuild/ElementFacade.java?rev=1301809&r1=1301808&r2=1301809&view=diff
==============================================================================
--- db/derby/code/branches/10.5/java/build/org/apache/derbyBuild/ElementFacade.java (original)
+++ db/derby/code/branches/10.5/java/build/org/apache/derbyBuild/ElementFacade.java Fri Mar
16 22:45:35 2012
@@ -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/branches/10.5/java/client/org/apache/derby/client/am/CallableStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/java/client/org/apache/derby/client/am/CallableStatement.java?rev=1301809&r1=1301808&r2=1301809&view=diff
==============================================================================
--- db/derby/code/branches/10.5/java/client/org/apache/derby/client/am/CallableStatement.java
(original)
+++ db/derby/code/branches/10.5/java/client/org/apache/derby/client/am/CallableStatement.java
Fri Mar 16 22:45:35 2012
@@ -163,7 +163,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/branches/10.5/java/client/org/apache/derby/client/am/Cursor.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/java/client/org/apache/derby/client/am/Cursor.java?rev=1301809&r1=1301808&r2=1301809&view=diff
==============================================================================
--- db/derby/code/branches/10.5/java/client/org/apache/derby/client/am/Cursor.java (original)
+++ db/derby/code/branches/10.5/java/client/org/apache/derby/client/am/Cursor.java Fri Mar
16 22:45:35 2012
@@ -1325,7 +1325,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/branches/10.5/java/client/org/apache/derby/client/am/PreparedStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/java/client/org/apache/derby/client/am/PreparedStatement.java?rev=1301809&r1=1301808&r2=1301809&view=diff
==============================================================================
--- db/derby/code/branches/10.5/java/client/org/apache/derby/client/am/PreparedStatement.java
(original)
+++ db/derby/code/branches/10.5/java/client/org/apache/derby/client/am/PreparedStatement.java
Fri Mar 16 22:45:35 2012
@@ -299,7 +299,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/branches/10.5/java/client/org/apache/derby/client/am/ResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/java/client/org/apache/derby/client/am/ResultSet.java?rev=1301809&r1=1301808&r2=1301809&view=diff
==============================================================================
--- db/derby/code/branches/10.5/java/client/org/apache/derby/client/am/ResultSet.java (original)
+++ db/derby/code/branches/10.5/java/client/org/apache/derby/client/am/ResultSet.java Fri
Mar 16 22:45:35 2012
@@ -4252,7 +4252,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));
     }
 
@@ -4856,7 +4856,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
@@ -5156,7 +5156,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/branches/10.5/java/client/org/apache/derby/client/am/Statement.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/java/client/org/apache/derby/client/am/Statement.java?rev=1301809&r1=1301808&r2=1301809&view=diff
==============================================================================
--- db/derby/code/branches/10.5/java/client/org/apache/derby/client/am/Statement.java (original)
+++ db/derby/code/branches/10.5/java/client/org/apache/derby/client/am/Statement.java Fri
Mar 16 22:45:35 2012
@@ -2500,7 +2500,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/branches/10.5/java/client/org/apache/derby/client/net/NetCallableStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/java/client/org/apache/derby/client/net/NetCallableStatement.java?rev=1301809&r1=1301808&r2=1301809&view=diff
==============================================================================
--- db/derby/code/branches/10.5/java/client/org/apache/derby/client/net/NetCallableStatement.java
(original)
+++ db/derby/code/branches/10.5/java/client/org/apache/derby/client/net/NetCallableStatement.java
Fri Mar 16 22:45:35 2012
@@ -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/branches/10.5/java/client/org/apache/derby/client/net/Reply.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/java/client/org/apache/derby/client/net/Reply.java?rev=1301809&r1=1301808&r2=1301809&view=diff
==============================================================================
--- db/derby/code/branches/10.5/java/client/org/apache/derby/client/net/Reply.java (original)
+++ db/derby/code/branches/10.5/java/client/org/apache/derby/client/net/Reply.java Fri Mar
16 22:45:35 2012
@@ -1412,7 +1412,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/branches/10.5/java/drda/org/apache/derby/impl/drda/PiggyBackedSessionData.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/java/drda/org/apache/derby/impl/drda/PiggyBackedSessionData.java?rev=1301809&r1=1301808&r2=1301809&view=diff
==============================================================================
--- db/derby/code/branches/10.5/java/drda/org/apache/derby/impl/drda/PiggyBackedSessionData.java
(original)
+++ db/derby/code/branches/10.5/java/drda/org/apache/derby/impl/drda/PiggyBackedSessionData.java
Fri Mar 16 22:45:35 2012
@@ -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/branches/10.5/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java?rev=1301809&r1=1301808&r2=1301809&view=diff
==============================================================================
--- db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
(original)
+++ db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
Fri Mar 16 22:45:35 2012
@@ -8490,7 +8490,6 @@ public final class	DataDictionaryImpl
 	 * Initialized the noncore info array.
 	 */
 	private void initializeNoncoreInfo()
-		throws StandardException
 	{
 		noncoreInfo = new TabInfoImpl[NUM_NONCORE];
 	}

Modified: db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/sql/compile/FromBaseTable.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/sql/compile/FromBaseTable.java?rev=1301809&r1=1301808&r2=1301809&view=diff
==============================================================================
--- db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/sql/compile/FromBaseTable.java
(original)
+++ db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/sql/compile/FromBaseTable.java
Fri Mar 16 22:45:35 2012
@@ -4537,7 +4537,6 @@ public class FromBaseTable extends FromT
 	}
 
 	private ConglomerateDescriptor getNextConglom(ConglomerateDescriptor currCD)
-		throws StandardException
 	{
 		int index = 0;
 

Modified: db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/sql/execute/MultiProbeTableScanResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/sql/execute/MultiProbeTableScanResultSet.java?rev=1301809&r1=1301808&r2=1301809&view=diff
==============================================================================
--- db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/sql/execute/MultiProbeTableScanResultSet.java
(original)
+++ db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/sql/execute/MultiProbeTableScanResultSet.java
Fri Mar 16 22:45:35 2012
@@ -472,7 +472,6 @@ class MultiProbeTableScanResultSet exten
      * then just return null.
      */
     private DataValueDescriptor getNextProbeValue()
-        throws StandardException
     {
         int ctr = probeValIndex;
 

Modified: db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/store/raw/data/StreamFileContainer.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/store/raw/data/StreamFileContainer.java?rev=1301809&r1=1301808&r2=1301809&view=diff
==============================================================================
--- db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/store/raw/data/StreamFileContainer.java
(original)
+++ db/derby/code/branches/10.5/java/engine/org/apache/derby/impl/store/raw/data/StreamFileContainer.java
Fri Mar 16 22:45:35 2012
@@ -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