db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r1049569 - in /db/derby/code/branches/10.7/java: client/org/apache/derby/client/am/DateTime.java drda/org/apache/derby/impl/drda/AppRequester.java engine/org/apache/derby/iapi/reference/DRDAConstants.java
Date Wed, 15 Dec 2010 14:44:39 GMT
Author: rhillegas
Date: Wed Dec 15 14:44:39 2010
New Revision: 1049569

URL: http://svn.apache.org/viewvc?rev=1049569&view=rev
Log:
DERBY-4614: Port 1049180 from trunk to 10.7 branch.

Modified:
    db/derby/code/branches/10.7/java/client/org/apache/derby/client/am/DateTime.java
    db/derby/code/branches/10.7/java/drda/org/apache/derby/impl/drda/AppRequester.java
    db/derby/code/branches/10.7/java/engine/org/apache/derby/iapi/reference/DRDAConstants.java

Modified: db/derby/code/branches/10.7/java/client/org/apache/derby/client/am/DateTime.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.7/java/client/org/apache/derby/client/am/DateTime.java?rev=1049569&r1=1049568&r2=1049569&view=diff
==============================================================================
--- db/derby/code/branches/10.7/java/client/org/apache/derby/client/am/DateTime.java (original)
+++ db/derby/code/branches/10.7/java/client/org/apache/derby/client/am/DateTime.java Wed Dec
15 14:44:39 2010
@@ -745,7 +745,7 @@ public class DateTime {
     public static int getTimestampLength( boolean supportsTimestampNanoseconds )
     {
         return supportsTimestampNanoseconds ?
-            DRDAConstants.JDBC_TIMESTAMP_LENGTH : DRDAConstants.DRDA_TIMESTAMP_LENGTH;
+            DRDAConstants.JDBC_TIMESTAMP_LENGTH : DRDAConstants.DRDA_OLD_TIMESTAMP_LENGTH;
     }
 
 }

Modified: db/derby/code/branches/10.7/java/drda/org/apache/derby/impl/drda/AppRequester.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.7/java/drda/org/apache/derby/impl/drda/AppRequester.java?rev=1049569&r1=1049568&r2=1049569&view=diff
==============================================================================
--- db/derby/code/branches/10.7/java/drda/org/apache/derby/impl/drda/AppRequester.java (original)
+++ db/derby/code/branches/10.7/java/drda/org/apache/derby/impl/drda/AppRequester.java Wed
Dec 15 14:44:39 2010
@@ -337,7 +337,7 @@ class AppRequester
     protected int getTimestampLength()
     {
         return supportsTimestampNanoseconds() ?
-            DRDAConstants.JDBC_TIMESTAMP_LENGTH : DRDAConstants.DRDA_TIMESTAMP_LENGTH;
+            DRDAConstants.JDBC_TIMESTAMP_LENGTH : DRDAConstants.DRDA_OLD_TIMESTAMP_LENGTH;
     }
 
 }

Modified: db/derby/code/branches/10.7/java/engine/org/apache/derby/iapi/reference/DRDAConstants.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.7/java/engine/org/apache/derby/iapi/reference/DRDAConstants.java?rev=1049569&r1=1049568&r2=1049569&view=diff
==============================================================================
--- db/derby/code/branches/10.7/java/engine/org/apache/derby/iapi/reference/DRDAConstants.java
(original)
+++ db/derby/code/branches/10.7/java/engine/org/apache/derby/iapi/reference/DRDAConstants.java
Wed Dec 15 14:44:39 2010
@@ -228,6 +228,7 @@ public	interface	DRDAConstants
     // nanoseconds precision: yyyy-mm-dd-hh.mm.ss.ffffff
     // In contrast, JDBC supports full nanoseconds precision: yyyy-mm-dd-hh.mm.ss.fffffffff
     //
+    public   static final int DRDA_OLD_TIMESTAMP_LENGTH = 26;
     public   static final int DRDA_TIMESTAMP_LENGTH = 29;
     public   static final int JDBC_TIMESTAMP_LENGTH = 29;
 



Mime
View raw message