svn commit: r933229 - /cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/CompactEndPointSerializationHelper.java

[gdusbabek]

Author: gdusbabek
Date: Mon Apr 12 13:34:10 2010
New Revision: 933229

URL: http://svn.apache.org/viewvc?rev=933229&view=rev
Log:
deserialize ipv6 addresses correctly. patch by Gary Dusbabek, reviewed by 
Jonathan Ellis. CASSANDRA-969

Modified:
    
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/CompactEndPointSerializationHelper.java

Modified: 
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/CompactEndPointSerializationHelper.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/CompactEndPointSerializationHelper.java?rev=933229&r1=933228&r2=933229&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/CompactEndPointSerializationHelper.java
 (original)
+++ 
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/CompactEndPointSerializationHelper.java
 Mon Apr 12 13:34:10 2010
@@ -24,13 +24,15 @@ import java.net.InetAddress;
 public class CompactEndPointSerializationHelper
 {
     public static void serialize(InetAddress endPoint, DataOutputStream dos) 
throws IOException
-    {        
-        dos.write(endPoint.getAddress());
+    {
+        byte[] buf = endPoint.getAddress();
+        dos.writeByte(buf.length);
+        dos.write(buf);
     }
     
     public static InetAddress deserialize(DataInputStream dis) throws 
IOException
     {     
-        byte[] bytes = new byte[4];
+        byte[] bytes = new byte[dis.readByte()];
         dis.readFully(bytes, 0, bytes.length);
         return InetAddress.getByAddress(bytes);
     }