svn commit: r1068434 - /cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/ByteBufferUtil.java

[jbellis]

Author: jbellis
Date: Tue Feb  8 15:07:22 2011
New Revision: 1068434

URL: http://svn.apache.org/viewvc?rev=1068434&view=rev
Log:
fix ByteBufferUtil.string position
patch by slebresne; reviewed by jbellis for CASSANDRA-2134

Modified:
    
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/ByteBufferUtil.java

Modified: 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/ByteBufferUtil.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/ByteBufferUtil.java?rev=1068434&r1=1068433&r2=1068434&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/ByteBufferUtil.java
 (original)
+++ 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/ByteBufferUtil.java
 Tue Feb  8 15:07:22 2011
@@ -106,15 +106,15 @@ public class ByteBufferUtil
         return string(buffer, Charset.defaultCharset());
     }
 
-    public static String string(ByteBuffer buffer, int offset, int length) 
throws CharacterCodingException
+    public static String string(ByteBuffer buffer, int position, int length) 
throws CharacterCodingException
     {
-        return string(buffer, offset, length, Charset.defaultCharset());
+        return string(buffer, position, length, Charset.defaultCharset());
     }
 
-    public static String string(ByteBuffer buffer, int offset, int length, 
Charset charset) throws CharacterCodingException
+    public static String string(ByteBuffer buffer, int position, int length, 
Charset charset) throws CharacterCodingException
     {
         ByteBuffer copy = buffer.duplicate();
-        copy.position(buffer.position() + offset);
+        copy.position(position);
         copy.limit(copy.position() + length);
         return string(buffer, charset);
     }