db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r672190 - in /db/derby/code/trunk: build.xml java/stubs/jsr169/java/sql/Timestamp.java
Date Fri, 27 Jun 2008 08:41:49 GMT
Author: kahatlen
Date: Fri Jun 27 01:41:48 2008
New Revision: 672190

URL: http://svn.apache.org/viewvc?rev=672190&view=rev
Log:
DERBY-3703: Make it possible to build the JSR169 support with the jdk1.4 libraries

Fixed build break with ant 1.6.5 (not seen with ant 1.7.0):
  * make sure setCompilerProperties is invoked before jsr169stubs
  * remove use of Java 1.5 classes in java.sql.Timestamp

Modified:
    db/derby/code/trunk/build.xml
    db/derby/code/trunk/java/stubs/jsr169/java/sql/Timestamp.java

Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?rev=672190&r1=672189&r2=672190&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Fri Jun 27 01:41:48 2008
@@ -31,7 +31,7 @@
 
 <!-- Targets -->
 
-  <target name="buildsource" depends="checkCompilerLevel,init,prebuild,setCompilerProperties,engine,storeless,tools,drda,client,build,versioninfo,localeinfo"/>
+  <target name="buildsource" depends="checkCompilerLevel,init,prebuild,setCompilerProperties,jsr169stubs,engine,storeless,tools,drda,client,build,versioninfo,localeinfo"/>
   <target name="all" depends="buildsource,demo,testing,pptesting"/>
 
 <!-- ==================================================================== -->
@@ -445,7 +445,7 @@
     <ant dir="${derby.client.src.dir}"/>
   </target>
 
-  <target name="prebuild" depends="jsr169stubs">
+  <target name="prebuild">
     <ant dir="${derby.build.src.dir}/org/apache/derbyPreBuild"/>
   </target>
 

Modified: db/derby/code/trunk/java/stubs/jsr169/java/sql/Timestamp.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/stubs/jsr169/java/sql/Timestamp.java?rev=672190&r1=672189&r2=672190&view=diff
==============================================================================
--- db/derby/code/trunk/java/stubs/jsr169/java/sql/Timestamp.java (original)
+++ db/derby/code/trunk/java/stubs/jsr169/java/sql/Timestamp.java Fri Jun 27 01:41:48 2008
@@ -274,7 +274,7 @@
      * Private method to format the time
      */
     private String format(int date, int digits) {
-        StringBuilder dateStringBuffer = new StringBuilder(String.valueOf(date));
+        StringBuffer dateStringBuffer = new StringBuffer(String.valueOf(date));
         while (dateStringBuffer.length() < digits) {
             dateStringBuffer = dateStringBuffer.insert(0, '0');
         }



Mime
View raw message