Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ca2f0223
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ca2f0223
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ca2f0223
Branch: refs/heads/trunk
Commit: ca2f022367ce01751805d28ff38d5e302f473313
Parents: aa8a7b5 62714a9
Author: Sam Tunnicliffe <s...@beobal.com>
Authored: Mon Jul 6 15:04:33 2015 +0100
Committer: Sam Tunnicliffe <s...@beobal.com>
Committed: Mon Jul 6 15:06:50 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/transport/Client.java | 3 +++
.../org/apache/cassandra/transport/messages/AuthSuccess.java | 8 ++++++--
3 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ca2f0223/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index ad5ed3d,ca4d4b5..69cb32c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,16 -1,5 +1,17 @@@
-2.0.17
+2.1.8
+ * Warn when an extra-large partition is compacted (CASSANDRA-9643)
+ * Eliminate strong self-reference chains in sstable ref tidiers
(CASSANDRA-9656)
+ * Ensure StreamSession uses canonical sstable reader instances
(CASSANDRA-9700)
+ * Ensure memtable book keeping is not corrupted in the event we shrink usage
(CASSANDRA-9681)
+ * Update internal python driver for cqlsh (CASSANDRA-9064)
+ * Fix IndexOutOfBoundsException when inserting tuple with too many
+ elements using the string literal notation (CASSANDRA-9559)
+ * Allow JMX over SSL directly from nodetool (CASSANDRA-9090)
+ * Fix incorrect result for IN queries where column not found (CASSANDRA-9540)
+ * Enable describe on indices (CASSANDRA-7814)
+ * ColumnFamilyStore.selectAndReference may block during compaction
(CASSANDRA-9637)
+Merged from 2.0:
+ * Avoid NPE in AuthSuccess#decode (CASSANDRA-9727)
* Add listen_address to system.local (CASSANDRA-9603)
* Bug fixes to resultset metadata construction (CASSANDRA-9636)
* Fix setting 'durable_writes' in ALTER KEYSPACE (CASSANDRA-9560)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ca2f0223/src/java/org/apache/cassandra/transport/Client.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/transport/Client.java
index c7c3103,4a50bde..8535dbd
--- a/src/java/org/apache/cassandra/transport/Client.java
+++ b/src/java/org/apache/cassandra/transport/Client.java
@@@ -32,6 -32,6 +32,7 @@@ import java.util.Map
import com.google.common.base.Splitter;
import org.apache.cassandra.auth.IAuthenticator;
++import org.apache.cassandra.config.Config;
import org.apache.cassandra.cql3.QueryOptions;
import org.apache.cassandra.db.ConsistencyLevel;
import org.apache.cassandra.db.marshal.Int32Type;
@@@ -233,6 -231,6 +234,8 @@@ public class Client extends SimpleClien
public static void main(String[] args) throws Exception
{
++ Config.setClientMode(true);
++
// Print usage if no argument is specified.
if (args.length != 2)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ca2f0223/src/java/org/apache/cassandra/transport/messages/AuthSuccess.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/transport/messages/AuthSuccess.java
index 98f50db,20bbed4..8c1b5b1
--- a/src/java/org/apache/cassandra/transport/messages/AuthSuccess.java
+++ b/src/java/org/apache/cassandra/transport/messages/AuthSuccess.java
@@@ -33,11 -33,15 +33,15 @@@ public class AuthSuccess extends Messag
{
public static final Message.Codec<AuthSuccess> codec = new
Message.Codec<AuthSuccess>()
{
- public AuthSuccess decode(ChannelBuffer body, int version)
+ public AuthSuccess decode(ByteBuf body, int version)
{
ByteBuffer b = CBUtil.readValue(body);
- byte[] token = new byte[b.remaining()];
- b.get(token);
+ byte[] token = null;
+ if (b != null)
+ {
+ token = new byte[b.remaining()];
+ b.get(token);
+ }
return new AuthSuccess(token);
}
