cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xe...@apache.org
Subject git commit: fix avro "caching" parameter handling when converting from avro object (see CASSANDRA-3143)
Date Mon, 09 Jan 2012 19:17:13 GMT
Updated Branches:
  refs/heads/trunk 9a11e424e -> bcc87a9ee


fix avro "caching" parameter handling when converting from avro object (see CASSANDRA-3143)


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bcc87a9e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bcc87a9e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bcc87a9e

Branch: refs/heads/trunk
Commit: bcc87a9ee83d3975919a12fdb95106f79f9c62a5
Parents: 9a11e42
Author: Pavel Yaskevich <povel.y@gmail.com>
Authored: Mon Jan 9 22:16:49 2012 +0200
Committer: Pavel Yaskevich <povel.y@gmail.com>
Committed: Mon Jan 9 22:16:49 2012 +0200

----------------------------------------------------------------------
 .../org/apache/cassandra/config/CFMetaData.java    |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bcc87a9e/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/CFMetaData.java b/src/java/org/apache/cassandra/config/CFMetaData.java
index 15680a5..3bc5d5a 100644
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@ -392,7 +392,7 @@ public final class CFMetaData
 
         try
         {
-            caching = Caching.fromString(cf.caching.toString());
+            caching = cf.caching == null ? Caching.KEYS_ONLY : Caching.fromString(cf.caching.toString());
         }
         catch (ConfigurationException e)
         {


Mime
View raw message