Changed Content to use ByteBuffer, added Message.Transfer and Message.Cancel handlers

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/qpid.0-9@497585 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 3 insertions, 5 deletions

diff --git a/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java b/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java
index 9e2beaa964..c585a66c58 100644
--- a/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java
+++ b/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java
@@ -557,8 +557,6 @@ public class BasicMessageProducer extends Closeable implements org.apache.qpid.j
                 messageHeaders.setExpiration(0);
             }
         }
-//        messageHeaders.setDeliveryMode((byte) deliveryMode);
-//        messageHeaders.setPriority((byte) priority);
 
         int size = (payload != null) ? payload.limit() : 0;
         Content[] content = createContent(payload);
@@ -656,7 +654,7 @@ public class BasicMessageProducer extends Closeable implements org.apache.qpid.j
 
         if (frameCount == 1)
         {
-            bodies[0] = new Content(Content.ContentTypeEnum.CONTENT_TYPE_INLINE, payload.array());
+            bodies[0] = new Content(Content.ContentTypeEnum.CONTENT_TYPE_INLINE, payload);
         }
         else
         {
@@ -666,7 +664,7 @@ public class BasicMessageProducer extends Closeable implements org.apache.qpid.j
                 payload.position((int) framePayloadMax * i);
                 int length = (remaining >= framePayloadMax) ? (int) framePayloadMax : (int) remaining;
                 payload.limit(payload.position() + length);
-                bodies[i] = new Content(Content.ContentTypeEnum.CONTENT_TYPE_INLINE, payload.slice().array());
+                bodies[i] = new Content(Content.ContentTypeEnum.CONTENT_TYPE_INLINE, payload.slice());
                 remaining -= length;
             }
         }
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java b/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java
index 5d77b022d5..f1ce5796d5 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java
+++ b/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java
@@ -41,7 +41,7 @@ public abstract class AbstractJMSMessageFactory implements MessageFactory
 			MessageHeaders contentHeader, Content body) throws AMQException {
         ByteBuffer data;
 
-        data = ByteBuffer.allocate(body.content.length);
+        data = ByteBuffer.allocate(body.content.remaining());
         data.put(body.content);
         data.flip();