From 56661d653a09b452904859a75566fe58c4bb7db8 Mon Sep 17 00:00:00 2001
From: Jonathan Ellis <jbellis@apache.org>
Date: Sat, 21 May 2011 02:16:42 +0000
Subject: [PATCH 1/2] minor comment clarification

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1125613 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/cassandra/service/RangeSliceResponseResolver.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/java/org/apache/cassandra/service/RangeSliceResponseResolver.java b/src/java/org/apache/cassandra/service/RangeSliceResponseResolver.java
index 09a4d17982..d90c0a5db3 100644
--- a/src/java/org/apache/cassandra/service/RangeSliceResponseResolver.java
+++ b/src/java/org/apache/cassandra/service/RangeSliceResponseResolver.java
@@ -62,7 +62,7 @@ public class RangeSliceResponseResolver implements IResponseResolver<Iterable<Ro
         return reply.rows;
     }
 
-    // Note: this deserializes the response a 2nd time if getData was called first
+    // Note: this would deserialize the response a 2nd time if getData was called first.
     // (this is not currently an issue since we don't do read repair for range queries.)
     public Iterable<Row> resolve() throws IOException
     {
@@ -73,7 +73,7 @@ public class RangeSliceResponseResolver implements IResponseResolver<Iterable<Ro
                 return o1.left.key.compareTo(o2.left.key);
             }
         });
-        
+
         int n = 0;
         for (Message response : responses)
         {
@@ -83,7 +83,6 @@ public class RangeSliceResponseResolver implements IResponseResolver<Iterable<Ro
         }
 
         // for each row, compute the combination of all different versions seen, and repair incomplete versions
-
         return new ReducingIterator<Pair<Row,InetAddress>, Row>(collator)
         {
             List<ColumnFamily> versions = new ArrayList<ColumnFamily>(sources.size());

From ed7f7e8f57e34f33b74e9c6e5179facc619ccbcf Mon Sep 17 00:00:00 2001
From: Jonathan Ellis <jbellis@apache.org>
Date: Mon, 23 May 2011 01:34:17 +0000
Subject: [PATCH 2/2] fix IntegerType.getString with direct buffers patch by Ed
 Anuff; reviewed by jbellis for CASSANDRA-2684

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1126290 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES.txt                                               | 1 +
 src/java/org/apache/cassandra/db/marshal/IntegerType.java | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 501d98fe68..3be9c2ac9b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -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
diff --git a/src/java/org/apache/cassandra/db/marshal/IntegerType.java b/src/java/org/apache/cassandra/db/marshal/IntegerType.java
index de23446671..c630940c03 100644
--- a/src/java/org/apache/cassandra/db/marshal/IntegerType.java
+++ b/src/java/org/apache/cassandra/db/marshal/IntegerType.java
@@ -125,7 +125,6 @@ public final class IntegerType extends AbstractType<BigInteger>
         return 0;
     }
 
-    @Override
     public String getString(ByteBuffer bytes)
     {
         if (bytes == null)
@@ -133,7 +132,7 @@ public final class IntegerType extends AbstractType<BigInteger>
         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)