You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by km...@apache.org on 2005/09/01 05:38:53 UTC
svn commit: r265639 - in /db/derby/code/branches/10.1/java:
engine/org/apache/derby/impl/load/
testing/org/apache/derbyTesting/functionTests/tests/tools/
Author: kmarsden
Date: Wed Aug 31 20:38:45 2005
New Revision: 265639
URL: http://svn.apache.org/viewcvs?rev=265639&view=rev
Log:
DERBY-452 - In J2ME/Foundation, getObject was throwing an exception because getObject on DECIMAL types is not supported.
I removed the call to getObject since it was a redundant check. getString internally checks for null values.
Patch contributed by Deepa Remesh dremesh@gmail.com
Modified:
db/derby/code/branches/10.1/java/engine/org/apache/derby/impl/load/ExportAbstract.java
db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ieptests_app.properties
db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExportThruIJ_app.properties
db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExport_app.properties
Modified: db/derby/code/branches/10.1/java/engine/org/apache/derby/impl/load/ExportAbstract.java
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/engine/org/apache/derby/impl/load/ExportAbstract.java?rev=265639&r1=265638&r2=265639&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/engine/org/apache/derby/impl/load/ExportAbstract.java (original)
+++ db/derby/code/branches/10.1/java/engine/org/apache/derby/impl/load/ExportAbstract.java Wed Aug 31 20:38:45 2005
@@ -59,10 +59,7 @@
if (rs.next()){
String[] rowObjects = new String[columnCount];
for (int colNum = 0; colNum < columnCount; colNum++) {
- if (rs.getObject(colNum + 1) != null)
- {
- rowObjects[colNum]=rs.getString(colNum + 1);
- }
+ rowObjects[colNum]=rs.getString(colNum + 1);
}
return rowObjects;
}
Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ieptests_app.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ieptests_app.properties?rev=265639&r1=265638&r2=265639&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ieptests_app.properties (original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ieptests_app.properties Wed Aug 31 20:38:45 2005
@@ -1,6 +1,3 @@
supportfiles=testData/ImportExport/db2ttypes.del,testData/ImportExport/mixednl.del,testData/ImportExport/position_info.del
usedefaults=true
-useextdirs=true
-
-#Exclude for J2ME/Foundation - test requires java.math.BigDecimal
-runwithfoundation=false
\ No newline at end of file
+useextdirs=true
\ No newline at end of file
Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExportThruIJ_app.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExportThruIJ_app.properties?rev=265639&r1=265638&r2=265639&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExportThruIJ_app.properties (original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExportThruIJ_app.properties Wed Aug 31 20:38:45 2005
@@ -1,6 +1,3 @@
supportfiles=testData/ImportExport/sqlAnywhere1.txt,testData/ImportExport/sqlAnywhere2.txt,testData/ImportExport/Access1.txt,testData/ImportExport/Access2.txt,testData/ImportExport/Access3.txt,testData/ImportExport/Alt1.asc,testData/ImportExport/Alt2.asc,testData/ImportExport/Alt3.asc,testData/ImportExport/Alt4.asc,testData/ImportExport/Alt5.asc,testData/ImportExport/Alt6.asc,testData/ImportExport/Tutor1.asc,testData/ImportExport/Tutor2.asc,testData/ImportExport/Tutor3.asc,testData/ImportExport/EndOfFile.txt
usedefaults=true
-useextdirs=true
-
-#Exclude for J2ME/Foundation - test requires java.math.BigDecimal
-runwithfoundation=false
\ No newline at end of file
+useextdirs=true
\ No newline at end of file
Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExport_app.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExport_app.properties?rev=265639&r1=265638&r2=265639&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExport_app.properties (original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExport_app.properties Wed Aug 31 20:38:45 2005
@@ -1,6 +1,3 @@
supportfiles=testData/ImportExport/EndOfFile.txt
usedefaults=true
-useextdirs=true
-
-#Exclude for J2ME/Foundation - test requires java.math.BigDecimal
-runwithfoundation=false
\ No newline at end of file
+useextdirs=true
\ No newline at end of file