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/30 20:36:54 UTC

[1/2] git commit: Set the content type as defined in the JMS mapping spec.

Repository: qpid-jms
Updated Branches:
  refs/heads/master 19b378bee -> 5b3d2038a


Set the content type as defined in the JMS mapping spec.

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

Branch: refs/heads/master
Commit: ad17c6bf62be2119c8183efe0b708393e45a43f1
Parents: 19b378b
Author: Timothy Bish <ta...@gmail.com>
Authored: Tue Sep 30 14:35:09 2014 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Tue Sep 30 14:35:09 2014 -0400

----------------------------------------------------------------------
 .../provider/amqp/message/AmqpJmsBytesMessageFacade.java    | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/ad17c6bf/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 53ff86c..0896eb0 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
@@ -47,6 +47,7 @@ public class AmqpJmsBytesMessageFacade extends AmqpJmsMessageFacade implements J
      */
     public AmqpJmsBytesMessageFacade(AmqpConnection connection) {
         super(connection);
+        setContentType(CONTENT_TYPE);
         setAnnotation(JMS_MSG_TYPE, JMS_BYTES_MESSAGE);
     }
 
@@ -67,9 +68,6 @@ public class AmqpJmsBytesMessageFacade extends AmqpJmsMessageFacade implements J
     public AmqpJmsBytesMessageFacade copy() {
         AmqpJmsBytesMessageFacade copy = new AmqpJmsBytesMessageFacade(connection);
         copyInto(copy);
-
-        copy.setContent(getContent().copy());
-
         return copy;
     }
 
@@ -79,11 +77,6 @@ public class AmqpJmsBytesMessageFacade extends AmqpJmsMessageFacade implements J
     }
 
     @Override
-    public String getContentType() {
-        return CONTENT_TYPE;
-    }
-
-    @Override
     public boolean isEmpty() {
         Binary payload = getBinaryFromBody();
         return payload != null && payload.getLength() > 0;


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


[2/2] git commit: clear the content type value on create to match the requirements in the JMS mapping spec.

Posted by ta...@apache.org.
clear the content type value on create to match the requirements in the
JMS mapping spec.

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

Branch: refs/heads/master
Commit: 5b3d2038a0028f22448decf6dd242e0fe4d743c6
Parents: ad17c6b
Author: Timothy Bish <ta...@gmail.com>
Authored: Tue Sep 30 14:35:47 2014 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Tue Sep 30 14:35:47 2014 -0400

----------------------------------------------------------------------
 .../qpid/jms/provider/amqp/message/AmqpTypedObjectDelegate.java     | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/5b3d2038/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpTypedObjectDelegate.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpTypedObjectDelegate.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpTypedObjectDelegate.java
index f5d8f0c..9fa88dd 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpTypedObjectDelegate.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpTypedObjectDelegate.java
@@ -43,6 +43,7 @@ public class AmqpTypedObjectDelegate implements AmqpObjectTypeDelegate {
      */
     public AmqpTypedObjectDelegate(Message message) {
         this.message = message;
+        this.message.setContentType(null);
     }
 
     @Override


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