From f82021b1b977d8eb7f9ca794cf05c9c38fddd9a2 Mon Sep 17 00:00:00 2001 From: Brandon Williams Date: Wed, 1 May 2013 20:09:21 -0500 Subject: [PATCH 1/4] Give users a clue how they called it. --- src/java/org/apache/cassandra/dht/RandomPartitioner.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java/org/apache/cassandra/dht/RandomPartitioner.java b/src/java/org/apache/cassandra/dht/RandomPartitioner.java index 26b399e8c5..f99bcc0f1a 100644 --- a/src/java/org/apache/cassandra/dht/RandomPartitioner.java +++ b/src/java/org/apache/cassandra/dht/RandomPartitioner.java @@ -161,7 +161,7 @@ public class RandomPartitioner extends AbstractPartitioner Iterator i = sortedTokens.iterator(); // 0-case - if (!i.hasNext()) { throw new RuntimeException("No nodes present in the cluster. How did you call this?"); } + if (!i.hasNext()) { throw new RuntimeException("No nodes present in the cluster. Has this node finished starting up?"); } // 1-case if (sortedTokens.size() == 1) { ownerships.put((Token)i.next(), new Float(1.0)); From dedeb0be8a8173a045e976b9878ff72110242f00 Mon Sep 17 00:00:00 2001 From: Brandon Williams Date: Wed, 1 May 2013 20:11:22 -0500 Subject: [PATCH 2/4] Give users a clue how they called it. --- src/java/org/apache/cassandra/dht/Murmur3Partitioner.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java/org/apache/cassandra/dht/Murmur3Partitioner.java b/src/java/org/apache/cassandra/dht/Murmur3Partitioner.java index a969320d39..502f5cc13a 100644 --- a/src/java/org/apache/cassandra/dht/Murmur3Partitioner.java +++ b/src/java/org/apache/cassandra/dht/Murmur3Partitioner.java @@ -121,7 +121,7 @@ public class Murmur3Partitioner extends AbstractPartitioner // 0-case if (!i.hasNext()) - throw new RuntimeException("No nodes present in the cluster. How did you call this?"); + throw new RuntimeException("No nodes present in the cluster. Has this node finished starting up?"); // 1-case if (sortedTokens.size() == 1) ownerships.put((Token) i.next(), new Float(1.0)); From f8567d15fee3bf4251e3324f1809edb29cd75645 Mon Sep 17 00:00:00 2001 From: Dave Brosius Date: Thu, 2 May 2013 10:08:44 -0400 Subject: [PATCH 3/4] explicitly set java source and target to 1.6 for the ant tasks patch by dbrosius reviewed by slebresne for CASSANDRA-5533 --- build.xml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/build.xml b/build.xml index 57e3ab2ad9..43172c9bc6 100644 --- a/build.xml +++ b/build.xml @@ -60,6 +60,10 @@ + + + + @@ -650,12 +654,12 @@ + destdir="${build.classes.thrift}" includeantruntime="false" source="${source.version}" target="${target.version}"> + destdir="${build.classes.main}" includeantruntime="false" source="${source.version}" target="${target.version}"> @@ -941,7 +945,9 @@ + destdir="${test.classes}" + source="${source.version}" + target="${target.version}"> From b4b4f6a95c1c80f34c287db675d5a23d705e11dc Mon Sep 17 00:00:00 2001 From: Dave Brosius Date: Thu, 2 May 2013 10:18:03 -0400 Subject: [PATCH 4/4] explicitly set java source and target to 1.6 for the ant tasks --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 3d76d14926..b77c4173f9 100644 --- a/build.xml +++ b/build.xml @@ -708,7 +708,7 @@ - +