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.0' into cassandra-2.1 

Conflicts:
	src/java/org/apache/cassandra/cql3/Tuples.java
This commit is contained in:
Tyler Hobbs 2014-05-28 17:00:28 -05:00
parent 5767757abc d92a79f5b3
commit ea02b69001
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/java/org/apache/cassandra/cql3/Tuples.java
View File

@ -308,9 +308,6 @@ public class Tuples
public Value bind(QueryOptions options) throws InvalidRequestException
{
ByteBuffer value = options.getValues().get(bindIndex);
if (value == null)
return null;
return value == null ? null : Value.fromSerialized(value, (TupleType)receiver.type);
}
}