natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-2.1' into cassandra-2.2 

Conflicts:
	src/java/org/apache/cassandra/transport/Client.java
This commit is contained in:
Sam Tunnicliffe 2015-07-06 15:09:30 +01:00
parent fe07092361 ca2f022367
commit 63e122c2c2
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -34,6 +34,7 @@ Merged from 2.1:
* Fix memory leak in Ref due to ConcurrentLinkedQueue.remove() behaviour (CASSANDRA-9549)
* Make rebuild only run one at a time (CASSANDRA-9119)
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)

8
src/java/org/apache/cassandra/transport/messages/AuthSuccess.java
View File

@ -36,8 +36,12 @@ public class AuthSuccess extends Message.Response
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);
}