Author: jbellis
Date: Thu Mar 10 20:56:57 2011
New Revision: 1080346
URL: http://svn.apache.org/viewvc?rev=1080346&view=rev
Log:
simplify ascii validation
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/marshal/AsciiType.java
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/marshal/AsciiType.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/marshal/AsciiType.java?rev=1080346&r1=1080345&r2=1080346&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/marshal/AsciiType.java
(original)
+++
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/marshal/AsciiType.java
Thu Mar 10 20:56:57 2011
@@ -55,9 +55,9 @@ public class AsciiType extends BytesType
public void validate(ByteBuffer bytes) throws MarshalException
{
// 0-127
- for (int i = 0; i < bytes.remaining(); i++)
+ for (int i = bytes.position(); i < bytes.limit(); i++)
{
- byte b = bytes.get(bytes.position() + i);
+ byte b = bytes.get(i);
if (b < 0 || b > 127)
throw new MarshalException("Invalid byte for ascii: " +
Byte.toString(b));
}