You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2015/01/28 16:39:17 UTC
cassandra git commit: Fix schema from Thrift conversion with empty
metadata
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 c75ee4160 -> b788bb371
Fix schema from Thrift conversion with empty metadata
patch by Chris Lockfort; reviewed by Aleksey Yeschenko for
CASSANDRA-8695
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b788bb37
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b788bb37
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b788bb37
Branch: refs/heads/cassandra-2.1
Commit: b788bb37121abbc6cc73b93aea98915613744889
Parents: c75ee41
Author: Chris Lockfort <cl...@palantir.com>
Authored: Tue Jan 27 16:43:18 2015 -0800
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Wed Jan 28 18:39:03 2015 +0300
----------------------------------------------------------------------
CHANGES.txt | 4 +++-
src/java/org/apache/cassandra/config/ColumnDefinition.java | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b788bb37/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index d142a68..b976a16 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,8 +1,10 @@
2.1.3
+ * Fix schema from Thrift conversion with empty metadata (CASSANDRA-8695)
* Safer Resource Management (CASSANDRA-7705)
* Make sure we compact highly overlapping cold sstables with
STCS (CASSANDRA-8635)
- * rpc_interface and listen_interface generate NPE on startup when specified interface doesn't exist (CASSANDRA-8677)
+ * rpc_interface and listen_interface generate NPE on startup when specified
+ interface doesn't exist (CASSANDRA-8677)
* Fix ArrayIndexOutOfBoundsException in nodetool cfhistograms (CASSANDRA-8514)
* Switch from yammer metrics for nodetool cf/proxy histograms (CASSANDRA-8662)
* Make sure we don't add tmplink files to the compaction
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b788bb37/src/java/org/apache/cassandra/config/ColumnDefinition.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/ColumnDefinition.java b/src/java/org/apache/cassandra/config/ColumnDefinition.java
index ff66162..d6cc94c 100644
--- a/src/java/org/apache/cassandra/config/ColumnDefinition.java
+++ b/src/java/org/apache/cassandra/config/ColumnDefinition.java
@@ -298,7 +298,7 @@ public class ColumnDefinition extends ColumnSpecification
public static List<ColumnDefinition> fromThrift(String ksName, String cfName, AbstractType<?> thriftComparator, AbstractType<?> thriftSubcomparator, List<ColumnDef> thriftDefs) throws SyntaxException, ConfigurationException
{
if (thriftDefs == null)
- return Collections.emptyList();
+ return new ArrayList<>();
List<ColumnDefinition> defs = new ArrayList<>(thriftDefs.size());
for (ColumnDef thriftColumnDef : thriftDefs)