From 56ece4db0f03f086c2d4608472de4b20e6a83a19 Mon Sep 17 00:00:00 2001
From: Muga Nishizawa <muga@f11vm.(none)>
Date: Tue, 14 Sep 2010 23:23:09 +0900
Subject: [PATCH] fixed a bug the program for packing and unpacking byte[] in
 annotation-utility

---
 .../java/org/msgpack/util/annotation/PackUnpackUtil.java     | 3 ++-
 .../msgpack/util/annotation/TestMessagePackUnpackable.java   | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/java/src/main/java/org/msgpack/util/annotation/PackUnpackUtil.java b/java/src/main/java/org/msgpack/util/annotation/PackUnpackUtil.java
index a58b4bd5..f92c51a0 100644
--- a/java/src/main/java/org/msgpack/util/annotation/PackUnpackUtil.java
+++ b/java/src/main/java/org/msgpack/util/annotation/PackUnpackUtil.java
@@ -71,7 +71,8 @@ public class PackUnpackUtil {
 
 		static final String TYPE_NAME_SHORT2 = Short.class.getName();
 
-		static final String TYPE_NAME_BYTEARRAY = byte[].class.getName();
+		//static final String TYPE_NAME_BYTEARRAY = byte[].class.getName();
+		static final String TYPE_NAME_BYTEARRAY = "byte[]";
 
 		static final String TYPE_NAME_LIST = List.class.getName();
 
diff --git a/java/src/test/java/org/msgpack/util/annotation/TestMessagePackUnpackable.java b/java/src/test/java/org/msgpack/util/annotation/TestMessagePackUnpackable.java
index 4f6e74ef..1cde65f2 100644
--- a/java/src/test/java/org/msgpack/util/annotation/TestMessagePackUnpackable.java
+++ b/java/src/test/java/org/msgpack/util/annotation/TestMessagePackUnpackable.java
@@ -69,6 +69,7 @@ public class TestMessagePackUnpackable extends TestCase {
 		src.f6 = false;
 		src.f7 = new BigInteger("7");
 		src.f8 = "8";
+		src.f9 = new byte[] { 0x01, 0x02 };
 		ByteArrayOutputStream out = new ByteArrayOutputStream();
 		new Packer(out).pack(src);
 		GeneralReferenceTypeFieldsClass dst = (GeneralReferenceTypeFieldsClass) PackUnpackUtil
@@ -85,6 +86,8 @@ public class TestMessagePackUnpackable extends TestCase {
 		assertEquals(src.f6, dst.f6);
 		assertEquals(src.f7, dst.f7);
 		assertEquals(src.f8, dst.f8);
+		assertEquals(src.f9[0], dst.f9[0]);
+		assertEquals(src.f9[1], dst.f9[1]);
 	}
 
 	@MessagePackUnpackable
@@ -98,13 +101,13 @@ public class TestMessagePackUnpackable extends TestCase {
 		public Boolean f6;
 		public BigInteger f7;
 		public String f8;
+		public byte[] f9;
 
 		public GeneralReferenceTypeFieldsClass() {
 		}
 	}
 
 	public void testListAndMap() throws Exception {
-		// TODO
 	}
 
 	@MessagePackUnpackable