Repository: qpid-jms Updated Branches: refs/heads/master a6d04de00 -> 5c46a63c3
simplify setting the encoding method and ensure it is a no-op if the method is unchanged Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/8aa3d4d9 Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/8aa3d4d9 Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/8aa3d4d9 Branch: refs/heads/master Commit: 8aa3d4d9824069a1e904a70268793126caffb4bc Parents: a6d04de Author: Robert Gemmell <rob...@apache.org> Authored: Fri Oct 10 12:36:15 2014 +0100 Committer: Robert Gemmell <rob...@apache.org> Committed: Fri Oct 10 12:36:15 2014 +0100 ---------------------------------------------------------------------- .../message/AmqpJmsObjectMessageFacade.java | 25 ++++++++++---------- .../amqp/message/AmqpObjectTypeDelegate.java | 1 + .../message/AmqpSerializedObjectDelegate.java | 5 ++++ .../amqp/message/AmqpTypedObjectDelegate.java | 5 ++++ 4 files changed, 24 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8aa3d4d9/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 894ff3a..4c18f7e 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 @@ -126,22 +126,23 @@ public class AmqpJmsObjectMessageFacade extends AmqpJmsMessageFacade implements } void setUseAmqpTypedEncoding(boolean useAmqpTypedEncoding) throws JMSException { - if (useAmqpTypedEncoding && delegate instanceof AmqpSerializedObjectDelegate) { - AmqpTypedObjectDelegate newDelegate = new AmqpTypedObjectDelegate(message); + if (useAmqpTypedEncoding != delegate.isAmqpTypeEncoded()) { try { - newDelegate.setObject(delegate.getObject()); - } catch (ClassNotFoundException | IOException e) { - throw JmsExceptionSupport.create(e); - } - delegate = newDelegate; - } else if (delegate instanceof AmqpTypedObjectDelegate) { - AmqpSerializedObjectDelegate newDelegate = new AmqpSerializedObjectDelegate(message); - try { - newDelegate.setObject(delegate.getObject()); + Serializable existingObject = delegate.getObject(); + + AmqpObjectTypeDelegate newDelegate = null; + if (useAmqpTypedEncoding) { + newDelegate = new AmqpTypedObjectDelegate(message); + } else { + newDelegate = new AmqpSerializedObjectDelegate(message); + } + + newDelegate.setObject(existingObject); + + delegate = newDelegate; } catch (ClassNotFoundException | IOException e) { throw JmsExceptionSupport.create(e); } - delegate = newDelegate; } } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8aa3d4d9/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpObjectTypeDelegate.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpObjectTypeDelegate.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpObjectTypeDelegate.java index cec37f0..fb74e68 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpObjectTypeDelegate.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpObjectTypeDelegate.java @@ -53,4 +53,5 @@ public interface AmqpObjectTypeDelegate { */ void onSend(); + boolean isAmqpTypeEncoded(); } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8aa3d4d9/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpSerializedObjectDelegate.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpSerializedObjectDelegate.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpSerializedObjectDelegate.java index d22d23a..647286e 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpSerializedObjectDelegate.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpSerializedObjectDelegate.java @@ -101,4 +101,9 @@ public class AmqpSerializedObjectDelegate implements AmqpObjectTypeDelegate { public void onSend() { this.message.setContentType(CONTENT_TYPE); } + + @Override + public boolean isAmqpTypeEncoded() { + return false; + } } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8aa3d4d9/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 e28dc39..36cdfd7 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 @@ -107,4 +107,9 @@ public class AmqpTypedObjectDelegate implements AmqpObjectTypeDelegate { serializable instanceof List<?> || serializable.getClass().isArray(); } + + @Override + public boolean isAmqpTypeEncoded() { + return true; + } } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
