From c2ea5dfa6a130c1550e420f2db28fa2d82879149 Mon Sep 17 00:00:00 2001
From: Gary Dusbabek <gdusbabek@apache.org>
Date: Mon, 12 Apr 2010 13:34:10 +0000
Subject: [PATCH] deserialize ipv6 addresses correctly. patch by Gary Dusbabek,
 reviewed by Jonathan Ellis. CASSANDRA-969

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.6@933229 13f79535-47bb-0310-9956-ffa450edef68
---
 .../cassandra/net/CompactEndPointSerializationHelper.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/java/org/apache/cassandra/net/CompactEndPointSerializationHelper.java b/src/java/org/apache/cassandra/net/CompactEndPointSerializationHelper.java
index 19af26c6f0..d9f0cfd26c 100644
--- a/src/java/org/apache/cassandra/net/CompactEndPointSerializationHelper.java
+++ b/src/java/org/apache/cassandra/net/CompactEndPointSerializationHelper.java
@@ -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);
     }