update ObjectMessage facade copying to maintain the delegate type
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/1f451b62 Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/1f451b62 Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/1f451b62 Branch: refs/heads/master Commit: 1f451b623240a85ca645d548fd48e69b837b8d36 Parents: 0001dd5 Author: Robert Gemmell <[email protected]> Authored: Fri Oct 3 12:15:18 2014 +0100 Committer: Robert Gemmell <[email protected]> Committed: Fri Oct 3 12:15:18 2014 +0100 ---------------------------------------------------------------------- .../qpid/jms/provider/amqp/message/AmqpJmsMessageFactory.java | 3 ++- .../jms/provider/amqp/message/AmqpJmsObjectMessageFacade.java | 7 +++---- .../qpid/jms/integration/ObjectMessageIntegrationTest.java | 2 -- 3 files changed, 5 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/1f451b62/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFactory.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFactory.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFactory.java index 3a918de..214d8e4 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFactory.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFactory.java @@ -102,7 +102,8 @@ public class AmqpJmsMessageFactory implements JmsMessageFactory { @Override public JmsObjectMessage createObjectMessage(Serializable payload) throws JMSException { - JmsObjectMessageFacade facade = new AmqpJmsObjectMessageFacade(connection); + // TODO Implement [Connection?] configuration to control default delegate type? + JmsObjectMessageFacade facade = new AmqpJmsObjectMessageFacade(connection, false); if (payload != null) { try { http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/1f451b62/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsObjectMessageFacade.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsObjectMessageFacade.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsObjectMessageFacade.java index 2fc08fe..11607a4 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsObjectMessageFacade.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsObjectMessageFacade.java @@ -44,12 +44,11 @@ public class AmqpJmsObjectMessageFacade extends AmqpJmsMessageFacade implements * @param connection * the AmqpConnection that under which this facade was created. */ - public AmqpJmsObjectMessageFacade(AmqpConnection connection) { + public AmqpJmsObjectMessageFacade(AmqpConnection connection, boolean isAmqpTypeEncoded) { super(connection); setAnnotation(JMS_MSG_TYPE, JMS_OBJECT_MESSAGE); - // TODO Implement Connection property to control default serialization type - initDelegate(false); + initDelegate(isAmqpTypeEncoded); } /** @@ -88,7 +87,7 @@ public class AmqpJmsObjectMessageFacade extends AmqpJmsMessageFacade implements @Override public AmqpJmsObjectMessageFacade copy() throws JMSException { - AmqpJmsObjectMessageFacade copy = new AmqpJmsObjectMessageFacade(connection); + AmqpJmsObjectMessageFacade copy = new AmqpJmsObjectMessageFacade(connection, isAmqpTypedEncoding()); copyInto(copy); try { http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/1f451b62/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ObjectMessageIntegrationTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ObjectMessageIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ObjectMessageIntegrationTest.java index f965f63..502c065 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ObjectMessageIntegrationTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ObjectMessageIntegrationTest.java @@ -51,7 +51,6 @@ import org.apache.qpid.jms.test.testpeer.matchers.types.EncodedDataMatcher; import org.apache.qpid.proton.amqp.Binary; import org.apache.qpid.proton.amqp.DescribedType; import org.apache.qpid.proton.amqp.Symbol; -import org.junit.Ignore; import org.junit.Test; public class ObjectMessageIntegrationTest extends QpidJmsTestCase @@ -217,7 +216,6 @@ public class ObjectMessageIntegrationTest extends QpidJmsTestCase //==== AMQP type system encoding ==== @Test(timeout = 5000) - @Ignore //TODO: currently failing due to sending the wrong type of section (seemingly still serializing) public void testSendBasicObjectMessageWithAmqpTypedContent() throws Exception { try(TestAmqpPeer testPeer = new TestAmqpPeer(IntegrationTestFixture.PORT);) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
