You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2012/10/19 00:45:06 UTC
[4/4] git commit: allow JdbcDate to compose null Date objects patch
by Sridharan Kuppa; reviewed by jbellis for CASSANDRA-4830
allow JdbcDate to compose null Date objects
patch by Sridharan Kuppa; reviewed by jbellis for CASSANDRA-4830
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9d7ba39c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9d7ba39c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9d7ba39c
Branch: refs/heads/cassandra-1.1
Commit: 9d7ba39cbb6f93759f654c7df1771b52354dec36
Parents: e400d0e
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Oct 18 17:42:10 2012 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Oct 18 17:42:10 2012 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/cql/jdbc/JdbcDate.java | 4 +++-
2 files changed, 4 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9d7ba39c/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 49164b6..4b72e91 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
1.1.7
+ * allow JdbcDate to compose null Date objects (CASSANDRA-4830)
* fix possible stackoverflow when compacting 1000s of sstables
(CASSANDRA-4765)
* fix wrong leveled compaction progress calculation (CASSANDRA-4807)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9d7ba39c/src/java/org/apache/cassandra/cql/jdbc/JdbcDate.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql/jdbc/JdbcDate.java b/src/java/org/apache/cassandra/cql/jdbc/JdbcDate.java
index 6d0e63f..b518d3b 100644
--- a/src/java/org/apache/cassandra/cql/jdbc/JdbcDate.java
+++ b/src/java/org/apache/cassandra/cql/jdbc/JdbcDate.java
@@ -117,7 +117,9 @@ public class JdbcDate extends AbstractJdbcType<Date>
public Date compose(ByteBuffer bytes)
{
- return new Date(ByteBufferUtil.toLong(bytes));
+ return bytes.remaining() > 0
+ ? new Date(ByteBufferUtil.toLong(bytes))
+ : null;
}
public ByteBuffer decompose(Date value)