You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ta...@apache.org on 2014/09/27 01:01:06 UTC

git commit: Remove all uses of HawtBuf and remove it as a dependency for the project.

Repository: qpid-jms
Updated Branches:
  refs/heads/master 42dca618f -> 0d7e2539a


Remove all uses of HawtBuf and remove it as a dependency for the
project.

Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/0d7e2539
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/0d7e2539
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/0d7e2539

Branch: refs/heads/master
Commit: 0d7e2539a2ee51d1a456bf8afe818dc4d1f392e4
Parents: 42dca61
Author: Timothy Bish <ta...@gmail.com>
Authored: Fri Sep 26 19:00:18 2014 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Fri Sep 26 19:00:18 2014 -0400

----------------------------------------------------------------------
 pom.xml                                         |  6 ---
 qpid-jms-client/pom.xml                         |  4 --
 .../qpid/jms/message/JmsBytesMessage.java       | 33 ++++++++-------
 .../message/facade/JmsBytesMessageFacade.java   | 12 +++---
 .../defaults/JmsDefaultBytesMessageFacade.java  | 13 +++---
 .../defaults/JmsDefaultMessageFacade.java       |  9 ++---
 .../amqp/message/AmqpJmsBytesMessageFacade.java | 16 ++++----
 .../qpid/jms/message/JmsBytesMessageTest.java   | 42 ++++++++++----------
 8 files changed, 62 insertions(+), 73 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/0d7e2539/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3918759..8d5a83e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,6 @@
     <!-- Dependency Versions for this Project -->
     <junit-version>4.11</junit-version>
     <slf4j-version>1.7.7</slf4j-version>
-    <hawtbuf-version>1.11</hawtbuf-version>
     <activemq-version>5.11-SNAPSHOT</activemq-version>
     <proton-version>1.0-SNAPSHOT</proton-version>
     <fuse-joram-tests-version>1.0</fuse-joram-tests-version>
@@ -158,11 +157,6 @@
         <version>${slf4j-version}</version>
       </dependency>
       <dependency>
-        <groupId>org.fusesource.hawtbuf</groupId>
-        <artifactId>hawtbuf</artifactId>
-        <version>${hawtbuf-version}</version>
-      </dependency>
-      <dependency>
         <groupId>xalan</groupId>
         <artifactId>xalan</artifactId>
         <version>${xalan-version}</version>

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/0d7e2539/qpid-jms-client/pom.xml
----------------------------------------------------------------------
diff --git a/qpid-jms-client/pom.xml b/qpid-jms-client/pom.xml
index 85f5b99..3fca330 100644
--- a/qpid-jms-client/pom.xml
+++ b/qpid-jms-client/pom.xml
@@ -41,10 +41,6 @@
       <artifactId>geronimo-jms_1.1_spec</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.fusesource.hawtbuf</groupId>
-      <artifactId>hawtbuf</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.apache.qpid</groupId>
       <artifactId>qpid-jms-selector</artifactId>
       <optional>true</optional>

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/0d7e2539/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsBytesMessage.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsBytesMessage.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsBytesMessage.java
index 2383768..90cab53 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsBytesMessage.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsBytesMessage.java
@@ -16,6 +16,11 @@
  */
 package org.apache.qpid.jms.message;
 
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufInputStream;
+import io.netty.buffer.ByteBufOutputStream;
+import io.netty.buffer.Unpooled;
+
 import java.io.DataInputStream;
 import java.io.EOFException;
 import java.io.IOException;
@@ -29,9 +34,6 @@ import javax.jms.MessageNotWriteableException;
 
 import org.apache.qpid.jms.exceptions.JmsExceptionSupport;
 import org.apache.qpid.jms.message.facade.JmsBytesMessageFacade;
-import org.fusesource.hawtbuf.Buffer;
-import org.fusesource.hawtbuf.ByteArrayInputStream;
-import org.fusesource.hawtbuf.DataByteArrayOutputStream;
 
 /**
  * A <CODE>BytesMessage</CODE> object is used to send a message containing a
@@ -85,7 +87,7 @@ import org.fusesource.hawtbuf.DataByteArrayOutputStream;
  */
 public class JmsBytesMessage extends JmsMessage implements BytesMessage {
 
-    protected transient DataByteArrayOutputStream bytesOut;
+    protected transient ByteBufOutputStream bytesOut;
     protected transient DataInputStream dataIn;
     protected transient int length;
 
@@ -781,38 +783,40 @@ public class JmsBytesMessage extends JmsMessage implements BytesMessage {
     /**
      * Direct view of the underlying message contents.
      *
-     * @return a Buffer holding the bytes contained in this message.
+     * @return a ByteBuf holding the bytes contained in this message.
      */
-    public Buffer getContent() {
+    public ByteBuf getContent() {
         return this.facade.getContent();
     }
 
     /**
-     * A direct write method to the underlying message content buffer.
+     * A direct write method to the underlying message content ByteBuf.
      *
      * @param content
      *        the new content to assign to this message.
      */
-    public void setContent(Buffer content) {
+    public void setContent(ByteBuf content) {
         this.facade.setContent(content);
     }
 
     private void initializeWriting() throws JMSException {
         checkReadOnlyBody();
         if (this.bytesOut == null) {
-            this.bytesOut = new DataByteArrayOutputStream();
+            this.bytesOut = new ByteBufOutputStream(Unpooled.buffer());
         }
     }
 
     private void initializeReading() throws JMSException {
         checkWriteOnlyBody();
         if (dataIn == null) {
-            Buffer buffer = facade.getContent();
+            ByteBuf buffer = facade.getContent();
             if (buffer == null) {
-                buffer = new Buffer(0);
+                buffer = Unpooled.EMPTY_BUFFER;
+            } else {
+                buffer.resetReaderIndex();
             }
-            dataIn = new DataInputStream(new ByteArrayInputStream(buffer));
-            this.length = buffer.getLength();
+            dataIn = new DataInputStream(new ByteBufInputStream(buffer));
+            this.length = buffer.readableBytes();
         }
     }
 
@@ -820,8 +824,7 @@ public class JmsBytesMessage extends JmsMessage implements BytesMessage {
         try {
             if (bytesOut != null) {
                 bytesOut.close();
-                Buffer bs = bytesOut.toBuffer();
-                facade.setContent(bs);
+                facade.setContent(bytesOut.buffer());
                 bytesOut = null;
             }
         } catch (IOException ioe) {

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/0d7e2539/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/facade/JmsBytesMessageFacade.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/facade/JmsBytesMessageFacade.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/facade/JmsBytesMessageFacade.java
index b2428eb..a382ff8 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/facade/JmsBytesMessageFacade.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/facade/JmsBytesMessageFacade.java
@@ -16,9 +16,9 @@
  */
 package org.apache.qpid.jms.message.facade;
 
-import javax.jms.JMSException;
+import io.netty.buffer.ByteBuf;
 
-import org.fusesource.hawtbuf.Buffer;
+import javax.jms.JMSException;
 
 /**
  * Interface for a Message Facade that wraps a BytesMessage based message
@@ -38,17 +38,17 @@ public interface JmsBytesMessageFacade extends JmsMessageFacade {
      * into a Buffer instance.  If the message contents are empty a null
      * Buffer instance may be returned.
      *
-     * @returns a new Buffer that contains the contents of this message.
+     * @returns a new ByteBuf that contains the contents of this message.
      */
-    Buffer getContent();
+    ByteBuf getContent();
 
     /**
      * Sets the contents of the message to the new value based on the bytes
-     * stored in the passed in Buffer.
+     * stored in the passed in ByteBuf.
      *
      * @param contents
      *        the new bytes to store in this message.
      */
-    void setContent(Buffer content);
+    void setContent(ByteBuf content);
 
 }

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/0d7e2539/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/facade/defaults/JmsDefaultBytesMessageFacade.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/facade/defaults/JmsDefaultBytesMessageFacade.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/facade/defaults/JmsDefaultBytesMessageFacade.java
index 6870eb6..23f1817 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/facade/defaults/JmsDefaultBytesMessageFacade.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/facade/defaults/JmsDefaultBytesMessageFacade.java
@@ -16,15 +16,16 @@
  */
 package org.apache.qpid.jms.message.facade.defaults;
 
+import io.netty.buffer.ByteBuf;
+
 import org.apache.qpid.jms.message.facade.JmsBytesMessageFacade;
-import org.fusesource.hawtbuf.Buffer;
 
 /**
  * A default implementation of the JmsBytesMessageFacade that simply holds a raw Buffer
  */
 public final class JmsDefaultBytesMessageFacade extends JmsDefaultMessageFacade implements JmsBytesMessageFacade {
 
-    private Buffer content;
+    private ByteBuf content;
 
     @Override
     public JmsMsgType getMsgType() {
@@ -36,7 +37,7 @@ public final class JmsDefaultBytesMessageFacade extends JmsDefaultMessageFacade
         JmsDefaultBytesMessageFacade copy = new JmsDefaultBytesMessageFacade();
         copyInto(copy);
         if (this.content != null) {
-            copy.setContent(this.content.deepCopy());
+            copy.setContent(this.content.copy());
         }
 
         return copy;
@@ -44,7 +45,7 @@ public final class JmsDefaultBytesMessageFacade extends JmsDefaultMessageFacade
 
     @Override
     public boolean isEmpty() {
-        if (content == null || content.length() == 0) {
+        if (content == null || content.readableBytes() == 0) {
             return true;
         }
 
@@ -57,12 +58,12 @@ public final class JmsDefaultBytesMessageFacade extends JmsDefaultMessageFacade
     }
 
     @Override
-    public Buffer getContent() {
+    public ByteBuf getContent() {
         return content;
     }
 
     @Override
-    public void setContent(Buffer content) {
+    public void setContent(ByteBuf content) {
         this.content = content;
     }
 }

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/0d7e2539/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/facade/defaults/JmsDefaultMessageFacade.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/facade/defaults/JmsDefaultMessageFacade.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/facade/defaults/JmsDefaultMessageFacade.java
index 41e5d4e..7b99f7d 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/facade/defaults/JmsDefaultMessageFacade.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/facade/defaults/JmsDefaultMessageFacade.java
@@ -16,8 +16,6 @@
  */
 package org.apache.qpid.jms.message.facade.defaults;
 
-import static org.fusesource.hawtbuf.Buffer.ascii;
-
 import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.Map;
@@ -26,7 +24,6 @@ import javax.jms.JMSException;
 
 import org.apache.qpid.jms.JmsDestination;
 import org.apache.qpid.jms.message.facade.JmsMessageFacade;
-import org.fusesource.hawtbuf.AsciiBuffer;
 
 /**
  * A default implementation of the JmsMessageFaceade that provides a generic
@@ -46,11 +43,11 @@ public class JmsDefaultMessageFacade implements JmsMessageFacade {
         TEXT("jms/text-message"),
         TEXT_NULL("jms/text-message-null");
 
-        public final AsciiBuffer buffer = new AsciiBuffer(this.name());
-        public final AsciiBuffer mime;
+        public final String buffer = new String(this.name());
+        public final String mime;
 
         JmsMsgType(String mime) {
-            this.mime = (ascii(mime));
+            this.mime = mime;
         }
     }
 

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/0d7e2539/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsBytesMessageFacade.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsBytesMessageFacade.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsBytesMessageFacade.java
index 6bf27cd..53ff86c 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsBytesMessageFacade.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsBytesMessageFacade.java
@@ -18,6 +18,8 @@ package org.apache.qpid.jms.provider.amqp.message;
 
 import static org.apache.qpid.jms.provider.amqp.message.AmqpMessageSupport.JMS_BYTES_MESSAGE;
 import static org.apache.qpid.jms.provider.amqp.message.AmqpMessageSupport.JMS_MSG_TYPE;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
 
 import org.apache.qpid.jms.message.facade.JmsBytesMessageFacade;
 import org.apache.qpid.jms.provider.amqp.AmqpConnection;
@@ -27,7 +29,6 @@ import org.apache.qpid.proton.amqp.messaging.AmqpValue;
 import org.apache.qpid.proton.amqp.messaging.Data;
 import org.apache.qpid.proton.amqp.messaging.Section;
 import org.apache.qpid.proton.message.Message;
-import org.fusesource.hawtbuf.Buffer;
 
 /**
  * A JmsBytesMessageFacade that wraps around Proton AMQP Message instances to provide
@@ -36,7 +37,6 @@ import org.fusesource.hawtbuf.Buffer;
 public class AmqpJmsBytesMessageFacade extends AmqpJmsMessageFacade implements JmsBytesMessageFacade {
 
     private static final String CONTENT_TYPE = "application/octet-stream";
-    private static final Buffer EMPTY_BUFFER = new Buffer(new byte[0]);
     private static final Data EMPTY_DATA = new Data(new Binary(new byte[0]));
 
     /**
@@ -68,7 +68,7 @@ public class AmqpJmsBytesMessageFacade extends AmqpJmsMessageFacade implements J
         AmqpJmsBytesMessageFacade copy = new AmqpJmsBytesMessageFacade(connection);
         copyInto(copy);
 
-        copy.setContent(getContent().deepCopy());
+        copy.setContent(getContent().copy());
 
         return copy;
     }
@@ -90,21 +90,21 @@ public class AmqpJmsBytesMessageFacade extends AmqpJmsMessageFacade implements J
     }
 
     @Override
-    public Buffer getContent() {
-        Buffer result = EMPTY_BUFFER;
+    public ByteBuf getContent() {
+        ByteBuf result = Unpooled.EMPTY_BUFFER;
         Binary payload = getBinaryFromBody();
         if (payload != null && payload.getLength() > 0) {
-            result = new Buffer(payload.getArray(), payload.getArrayOffset(), payload.getLength());
+            result = Unpooled.wrappedBuffer(payload.getArray(), payload.getArrayOffset(), payload.getLength());
         }
 
         return result;
     }
 
     @Override
-    public void setContent(Buffer content) {
+    public void setContent(ByteBuf content) {
         Data body = EMPTY_DATA;
         if (content != null) {
-            body = new Data(new Binary(content.data, content.offset, content.length));
+            body = new Data(new Binary(content.array(), content.arrayOffset(), content.readableBytes()));
         }
 
         getAmqpMessage().setBody(body);

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/0d7e2539/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsBytesMessageTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsBytesMessageTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsBytesMessageTest.java
index 5f29da1..9314821 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsBytesMessageTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsBytesMessageTest.java
@@ -22,6 +22,8 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
 
 import java.util.Arrays;
 
@@ -31,11 +33,7 @@ import javax.jms.MessageFormatException;
 import javax.jms.MessageNotReadableException;
 import javax.jms.MessageNotWriteableException;
 
-import org.apache.qpid.jms.message.JmsBytesMessage;
-import org.apache.qpid.jms.message.JmsDefaultMessageFactory;
-import org.apache.qpid.jms.message.JmsMessageFactory;
 import org.apache.qpid.jms.message.facade.defaults.JmsDefaultBytesMessageFacade;
-import org.fusesource.hawtbuf.Buffer;
 import org.junit.Test;
 
 /**
@@ -80,7 +78,7 @@ public class JmsBytesMessageTest {
 
     @Test
     public void testReadBytesUsingReceivedMessageWithBodyReturnsBytes() throws Exception {
-        Buffer content = new Buffer("myBytesData".getBytes());
+        ByteBuf content = Unpooled.wrappedBuffer("myBytesData".getBytes());
         JmsDefaultBytesMessageFacade facade = new JmsDefaultBytesMessageFacade();
         facade.setContent(content);
 
@@ -88,15 +86,15 @@ public class JmsBytesMessageTest {
         bytesMessage.onSend();
 
         // retrieve the expected bytes, check they match
-        byte[] receivedBytes = new byte[content.length];
+        byte[] receivedBytes = new byte[content.array().length];
         bytesMessage.readBytes(receivedBytes);
-        assertTrue(Arrays.equals(content.data, receivedBytes));
+        assertTrue(Arrays.equals(content.array(), receivedBytes));
 
         // verify no more bytes remain, i.e EOS
         assertEquals("Expected input stream to be at end but data was returned",
                      END_OF_STREAM, bytesMessage.readBytes(new byte[1]));
 
-        assertEquals("Message reports unexpected length", content.length, bytesMessage.getBodyLength());
+        assertEquals("Message reports unexpected length", content.array().length, bytesMessage.getBodyLength());
     }
 
     /**
@@ -105,13 +103,13 @@ public class JmsBytesMessageTest {
      */
     @Test(expected = MessageNotWriteableException.class)
     public void testReceivedBytesMessageThrowsMessageNotWriteableExceptionOnWriteBytes() throws Exception {
-        Buffer content = new Buffer("myBytesData".getBytes());
+        ByteBuf content = Unpooled.wrappedBuffer("myBytesData".getBytes());
         JmsDefaultBytesMessageFacade facade = new JmsDefaultBytesMessageFacade();
         facade.setContent(content);
 
         JmsBytesMessage bytesMessage = new JmsBytesMessage(facade);
         bytesMessage.onSend();
-        bytesMessage.writeBytes(content.data);
+        bytesMessage.writeBytes(content.array());
     }
 
     /**
@@ -131,7 +129,7 @@ public class JmsBytesMessageTest {
      */
     @Test
     public void testClearBodyOnReceivedBytesMessageMakesMessageWritable() throws Exception {
-        Buffer content = new Buffer("myBytesData".getBytes());
+        ByteBuf content = Unpooled.wrappedBuffer("myBytesData".getBytes());
         JmsDefaultBytesMessageFacade facade = new JmsDefaultBytesMessageFacade();
         facade.setContent(content);
 
@@ -148,7 +146,7 @@ public class JmsBytesMessageTest {
      */
     @Test
     public void testClearBodyOnReceivedBytesMessageClearsUnderlyingMessageBody() throws Exception {
-        Buffer content = new Buffer("myBytesData".getBytes());
+        ByteBuf content = Unpooled.wrappedBuffer("myBytesData".getBytes());
         JmsDefaultBytesMessageFacade facade = new JmsDefaultBytesMessageFacade();
         facade.setContent(content);
 
@@ -166,13 +164,13 @@ public class JmsBytesMessageTest {
      */
     @Test
     public void testGetBodyLengthOnClearedReceivedMessageThrowsMessageNotReadableException() throws Exception {
-        Buffer content = new Buffer("myBytesData".getBytes());
+        ByteBuf content = Unpooled.wrappedBuffer("myBytesData".getBytes());
         JmsDefaultBytesMessageFacade facade = new JmsDefaultBytesMessageFacade();
         facade.setContent(content);
 
         JmsBytesMessage bytesMessage = new JmsBytesMessage(facade);
         bytesMessage.onSend();
-        assertEquals("Unexpected message length", content.length, bytesMessage.getBodyLength());
+        assertEquals("Unexpected message length", content.array().length, bytesMessage.getBodyLength());
         bytesMessage.clearBody();
 
         try {
@@ -189,7 +187,7 @@ public class JmsBytesMessageTest {
      */
     @Test
     public void testResetOnReceivedBytesMessageResetsMarker() throws Exception {
-        Buffer content = new Buffer("resetTestBytes".getBytes());
+        ByteBuf content = Unpooled.wrappedBuffer("resetTestBytes".getBytes());
         JmsDefaultBytesMessageFacade facade = new JmsDefaultBytesMessageFacade();
         facade.setContent(content);
 
@@ -199,15 +197,15 @@ public class JmsBytesMessageTest {
         // retrieve a few bytes, check they match the first few expected bytes
         byte[] partialBytes = new byte[3];
         bytesMessage.readBytes(partialBytes);
-        byte[] partialOriginalBytes = Arrays.copyOf(content.data, 3);
+        byte[] partialOriginalBytes = Arrays.copyOf(content.array(), 3);
         assertTrue(Arrays.equals(partialOriginalBytes, partialBytes));
 
         bytesMessage.reset();
 
         // retrieve all the expected bytes, check they match
-        byte[] resetBytes = new byte[content.length];
+        byte[] resetBytes = new byte[content.array().length];
         bytesMessage.readBytes(resetBytes);
-        assertTrue(Arrays.equals(content.data, resetBytes));
+        assertTrue(Arrays.equals(content.array(), resetBytes));
     }
 
     /**
@@ -216,21 +214,21 @@ public class JmsBytesMessageTest {
      */
     @Test
     public void testResetOnNewlyPopulatedBytesMessageResetsMarkerAndMakesReadable() throws Exception {
-        Buffer content = new Buffer("newResetTestBytes".getBytes());
+        ByteBuf content = Unpooled.wrappedBuffer("newResetTestBytes".getBytes());
         JmsDefaultBytesMessageFacade facade = new JmsDefaultBytesMessageFacade();
         facade.setContent(content);
 
         JmsBytesMessage bytesMessage = new JmsBytesMessage(facade);
 
         assertFalse("Message should be writable", bytesMessage.isReadOnlyBody());
-        bytesMessage.writeBytes(content.data);
+        bytesMessage.writeBytes(content.array());
         bytesMessage.reset();
         assertTrue("Message should not be writable", bytesMessage.isReadOnlyBody());
 
         // retrieve the bytes, check they match
-        byte[] resetBytes = new byte[content.length];
+        byte[] resetBytes = new byte[content.array().length];
         bytesMessage.readBytes(resetBytes);
-        assertTrue(Arrays.equals(content.data, resetBytes));
+        assertTrue(Arrays.equals(content.array(), resetBytes));
     }
 
     /**


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org