svn commit: r1028589 - /cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/dht/BytesToken.java

[jb...@apache.org]

Author: jbellis
Date: Fri Oct 29 02:13:25 2010
New Revision: 1028589

URL: http://svn.apache.org/viewvc?rev=1028589&view=rev
Log:
use TBaseHelper in BytesToken.  patch by jbellis

Modified:
    cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/dht/BytesToken.java

Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/dht/BytesToken.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/dht/BytesToken.java?rev=1028589&r1=1028588&r2=1028589&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/dht/BytesToken.java (original)
+++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/dht/BytesToken.java Fri Oct 29 02:13:25 2010
@@ -22,30 +22,20 @@ import java.nio.ByteBuffer;
 import java.util.Arrays;
 
 import org.apache.cassandra.utils.FBUtilities;
+import org.apache.thrift.TBaseHelper;
 
 public class BytesToken extends Token<byte[]>
 {
-	public BytesToken(ByteBuffer token)
-	{
-		this(convertByteBuffer(token));
-	}
-	
+    public BytesToken(ByteBuffer token)
+    {
+        this(TBaseHelper.byteBufferToByteArray(token));
+    }
+
     public BytesToken(byte[] token)
     {
         super(token);
     }
-    
-    private static byte[] convertByteBuffer(ByteBuffer token)
-    {
-        if (token.position() == 0 && token.arrayOffset() == 0 && token.limit() == token.capacity())
-            return token.array();
 
-        token = token.duplicate();
-        byte[] buf = new byte[token.remaining()];
-        token.get(buf);
-        return buf;
-    }
-    
     @Override
     public String toString()
     {
@@ -77,5 +67,4 @@ public class BytesToken extends Token<by
            
         return Arrays.equals(token, other.token);
     }
-
 }