Author: jbellis
Date: Fri Sep 30 19:15:25 2011
New Revision: 1177781
URL: http://svn.apache.org/viewvc?rev=1177781&view=rev
Log:
move slice() call into validate() to make it more obvious that it's not missing
Modified:
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/marshal/UTF8Type.java
Modified:
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/marshal/UTF8Type.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/marshal/UTF8Type.java?rev=1177781&r1=1177780&r2=1177781&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/marshal/UTF8Type.java
(original)
+++
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/marshal/UTF8Type.java
Fri Sep 30 19:15:25 2011
@@ -72,7 +72,7 @@ public class UTF8Type extends AbstractTy
public void validate(ByteBuffer bytes) throws MarshalException
{
- if (!UTF8Validator.validate(bytes.slice()))
+ if (!UTF8Validator.validate(bytes))
throw new MarshalException("String didn't validate.");
}
@@ -93,6 +93,7 @@ public class UTF8Type extends AbstractTy
// buf has already been sliced/duplicated.
static boolean validate(ByteBuffer buf)
{
+ buf = buf.slice();
int b = 0;
State state = State.START;
while (buf.remaining() > 0)