QPID-2627 : Remove dependency on MINA

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1167311 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 6 insertions, 12 deletions

diff --git a/java/client/src/test/java/org/apache/qpid/client/util/ClassLoadingAwareObjectInputStreamTest.java b/java/client/src/test/java/org/apache/qpid/client/util/ClassLoadingAwareObjectInputStreamTest.java
index 93a4fb39f5..a12e4ce977 100644
--- a/java/client/src/test/java/org/apache/qpid/client/util/ClassLoadingAwareObjectInputStreamTest.java
+++ b/java/client/src/test/java/org/apache/qpid/client/util/ClassLoadingAwareObjectInputStreamTest.java
@@ -20,13 +20,13 @@
  */
 package org.apache.qpid.client.util;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.io.ObjectOutputStream;
-import java.lang.reflect.Proxy;
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.mina.common.ByteBuffer;
 import org.apache.qpid.test.utils.QpidTestCase;
 
 public class ClassLoadingAwareObjectInputStreamTest extends QpidTestCase
@@ -37,16 +37,15 @@ public class ClassLoadingAwareObjectInputStreamTest extends QpidTestCase
     protected void setUp() throws Exception
     {
         //Create a viable input stream for instantiating the CLA OIS
-        ByteBuffer buf = ByteBuffer.allocate(10);
-        buf.setAutoExpand(true);
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
 
-        ObjectOutputStream out = new ObjectOutputStream(buf.asOutputStream());
+        ObjectOutputStream out = new ObjectOutputStream(baos);
         out.writeObject("testString");
         out.flush();
         out.close();
 
-        buf.rewind();
-        _in = buf.asInputStream();
+
+        _in = new ByteArrayInputStream(baos.toByteArray());
 
         _claOIS = new ClassLoadingAwareObjectInputStream(_in);
     }
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageUnitTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageUnitTest.java
index 177dccea7e..e37970e9a2 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageUnitTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageUnitTest.java
@@ -45,8 +45,6 @@ public class ObjectMessageUnitTest extends QpidTestCase
         _om.setObject(true);
 
         //make the message readable
-        _om.reset();
-
         Object object = _om.getObject();
 
         assertTrue("Unexpected type returned", object instanceof Boolean);
@@ -61,8 +59,6 @@ public class ObjectMessageUnitTest extends QpidTestCase
         _om.setObject("test string");
 
         //make the message readable
-        _om.reset();
-
         Object object = _om.getObject();
 
         assertTrue("Unexpected type returned", object instanceof String);
@@ -87,7 +83,6 @@ public class ObjectMessageUnitTest extends QpidTestCase
         list.add(0);
 
         //make the message readable
-        _om.reset();
 
         //retrieve the Object
         Object object = _om.getObject();