Author: jbellis
Date: Mon May 23 01:34:17 2011
New Revision: 1126290
URL: http://svn.apache.org/viewvc?rev=1126290&view=rev
Log:
fix IntegerType.getString with direct buffers
patch by Ed Anuff; reviewed by jbellis for CASSANDRA-2684
Modified:
cassandra/branches/cassandra-0.7/CHANGES.txt
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/marshal/IntegerType.java
Modified: cassandra/branches/cassandra-0.7/CHANGES.txt
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/CHANGES.txt?rev=1126290&r1=1126289&r2=1126290&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.7/CHANGES.txt Mon May 23 01:34:17 2011
@@ -4,6 +4,7 @@
* mark BRAF buffer invalid post-flush so we don't re-flush partial
buffers again, especially on CL writes (CASSANDRA-2660)
* don't perform HH to client-mode [storageproxy] nodes (CASSANDRA-2668)
+ * fix IntegerType.getString with direct buffers (CASSANDRA-2684)
0.7.6
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/marshal/IntegerType.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/marshal/IntegerType.java?rev=1126290&r1=1126289&r2=1126290&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/marshal/IntegerType.java
(original)
+++
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/marshal/IntegerType.java
Mon May 23 01:34:17 2011
@@ -125,7 +125,6 @@ public final class IntegerType extends A
return 0;
}
- @Override
public String getString(ByteBuffer bytes)
{
if (bytes == null)
@@ -133,7 +132,7 @@ public final class IntegerType extends A
if (bytes.remaining() == 0)
return "empty";
- return new
java.math.BigInteger(TBaseHelper.byteBufferToByteArray(bytes)).toString(10);
+ return new
java.math.BigInteger(ByteBufferUtil.getArray(bytes)).toString(10);
}
public ByteBuffer fromString(String source)
