db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r1023662 - in /db/derby/code/trunk/java/tools: build.xml org/apache/derby/iapi/tools/i18n/LocalizedResource.java
Date Mon, 18 Oct 2010 06:40:26 GMT
Author: kahatlen
Date: Mon Oct 18 06:40:26 2010
New Revision: 1023662

URL: http://svn.apache.org/viewvc?rev=1023662&view=rev
Log:
DERBY-4845: Improve the dependency tracking for our build targets

- Compile iapi/tools before impl/tools to ensure that the iapi classes
  are not compiled by the impl build targets

- Make LocalizedResource compilable against the JSR-169 libraries

Modified:
    db/derby/code/trunk/java/tools/build.xml
    db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java

Modified: db/derby/code/trunk/java/tools/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/build.xml?rev=1023662&r1=1023661&r2=1023662&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/build.xml (original)
+++ db/derby/code/trunk/java/tools/build.xml Mon Oct 18 06:40:26 2010
@@ -56,8 +56,8 @@
   </target>
 
   <target name="tools_base">
-    <ant dir="${derby.tools.dir}/impl/tools"/>
     <ant dir="${derby.tools.dir}/iapi/tools"/>
+    <ant dir="${derby.tools.dir}/impl/tools"/>
     <ant dir="${derby.tools.dir}/tools"/>
     <ant dir="${derby.tools.dir}/loc"/>
   </target>

Modified: db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java?rev=1023662&r1=1023661&r2=1023662&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java
(original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java
Mon Oct 18 06:40:26 2010
@@ -348,7 +348,10 @@ public final class LocalizedResource  im
 				return getNumberAsString(rs.getDouble(columnNumber));
 			}
 			else if (SUPPORTS_BIG_DECIMAL_CALLS && (type == Types.NUMERIC || type == Types.DECIMAL))
{
-				return getNumberAsString(rs.getBigDecimal(columnNumber));
+				// BigDecimal JDBC calls are supported on this platform, but
+				// use getObject() so that the class can be compiled against
+				// the JSR-169 libraries.
+				return getNumberAsString(rs.getObject(columnNumber));
 			}
 			else if (type == Types.TIME ) {
 				return getTimeAsString(rs.getTime(columnNumber));



Mime
View raw message