You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2009/09/28 17:53:40 UTC
svn commit: r819612 -
/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnSerializer.java
Author: jbellis
Date: Mon Sep 28 15:53:40 2009
New Revision: 819612
URL: http://svn.apache.org/viewvc?rev=819612&view=rev
Log:
fix bit math on column name read
patch by jbellis; tested by T Jake Luciani for CASSANDRA-460
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnSerializer.java
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnSerializer.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnSerializer.java?rev=819612&r1=819611&r2=819612&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnSerializer.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnSerializer.java Mon Sep 28 15:53:40 2009
@@ -41,8 +41,8 @@
public static byte[] readName(DataInput in) throws IOException
{
int length = 0;
- length |= (in.readByte() << 8);
- length |= in.readByte();
+ length |= (in.readByte() & 0xFF) << 8;
+ length |= in.readByte() & 0xFF;
byte[] bytes = new byte[length];
in.readFully(bytes);
return bytes;