diff options
Diffstat (limited to 'java/client')
4 files changed, 22 insertions, 26 deletions
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQSession.java b/java/client/src/main/java/org/apache/qpid/client/AMQSession.java index 22f3b97ecf..b632c56708 100644 --- a/java/client/src/main/java/org/apache/qpid/client/AMQSession.java +++ b/java/client/src/main/java/org/apache/qpid/client/AMQSession.java @@ -1015,6 +1015,7 @@ public abstract class AMQSession<C extends BasicMessageConsumer, P extends Basic } catch (URISyntaxException urlse) { + _logger.error("", urlse); JMSException jmse = new JMSException(urlse.getReason()); jmse.setLinkedException(urlse); diff --git a/java/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java b/java/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java index d1b3baff6c..a7d41e2cde 100644 --- a/java/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java +++ b/java/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java @@ -48,6 +48,7 @@ public class MessageFactoryRegistry private final Map<String, MessageFactory> _mimeStringToFactoryMap = new HashMap<String, MessageFactory>(); private final Map<AMQShortString, MessageFactory> _mimeShortStringToFactoryMap = new HashMap<AMQShortString, MessageFactory>(); + private final MessageFactory _default = new JMSBytesMessageFactory(); /** * Construct a new registry with the default message factories registered @@ -63,7 +64,7 @@ public class MessageFactoryRegistry mf.registerFactory(JMSBytesMessage.MIME_TYPE, new JMSBytesMessageFactory()); mf.registerFactory(JMSObjectMessage.MIME_TYPE, new JMSObjectMessageFactory()); mf.registerFactory(JMSStreamMessage.MIME_TYPE, new JMSStreamMessageFactory()); - mf.registerFactory(null, new JMSBytesMessageFactory()); + mf.registerFactory(null, mf._default); return mf; } @@ -113,12 +114,10 @@ public class MessageFactoryRegistry MessageFactory mf = _mimeShortStringToFactoryMap.get(contentTypeShortString); if (mf == null) { - throw new AMQException(null, "Unsupport MIME type of " + properties.getContentTypeAsString(), null); - } - else - { - return mf.createMessage(deliveryTag, redelivered, contentHeader, exchange, routingKey, bodies); + mf = _default; } + + return mf.createMessage(deliveryTag, redelivered, contentHeader, exchange, routingKey, bodies); } public AbstractJMSMessage createMessage(MessageTransfer transfer) throws AMQException, JMSException @@ -138,22 +137,20 @@ public class MessageFactoryRegistry MessageFactory mf = _mimeStringToFactoryMap.get(messageType); if (mf == null) { - throw new AMQException(null, "Unsupport MIME type of " + messageType, null); + mf = _default; } - else + + boolean redelivered = false; + DeliveryProperties deliverProps; + if((deliverProps = transfer.getHeader().get(DeliveryProperties.class)) != null) { - boolean redelivered = false; - DeliveryProperties deliverProps; - if((deliverProps = transfer.getHeader().get(DeliveryProperties.class)) != null) - { - redelivered = deliverProps.getRedelivered(); - } - return mf.createMessage(transfer.getId(), - redelivered, - mprop == null? new MessageProperties():mprop, - deliverProps == null? new DeliveryProperties():deliverProps, - transfer.getBody()); + redelivered = deliverProps.getRedelivered(); } + return mf.createMessage(transfer.getId(), + redelivered, + mprop == null? new MessageProperties():mprop, + deliverProps == null? new DeliveryProperties():deliverProps, + transfer.getBody()); } @@ -167,11 +164,9 @@ public class MessageFactoryRegistry MessageFactory mf = _mimeStringToFactoryMap.get(mimeType); if (mf == null) { - throw new AMQException(null, "Unsupport MIME type of " + mimeType, null); - } - else - { - return mf.createMessage(delegateFactory); + mf = _default; } + + return mf.createMessage(delegateFactory); } } diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/message/BytesMessageTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/message/BytesMessageTest.java index bbabf0b57d..65013e7e6d 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/client/message/BytesMessageTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/message/BytesMessageTest.java @@ -559,7 +559,7 @@ public class BytesMessageTest extends TestCase JMSBytesMessage bm = TestMessageHelper.newJMSBytesMessage(); bm.reset(); String result = bm.toBodyString(); - assertNull(result); + assertEquals("\"\"", result); } public static junit.framework.Test suite() diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/message/StreamMessageTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/message/StreamMessageTest.java index 802f1e6c2e..085dd81079 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/client/message/StreamMessageTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/message/StreamMessageTest.java @@ -435,7 +435,7 @@ public class StreamMessageTest extends TestCase JMSStreamMessage bm = TestMessageHelper.newJMSStreamMessage(); bm.reset(); String result = bm.toBodyString(); - assertNull(result); + assertEquals("\"\"", result); } private void checkConversionsFail(StreamMessage sm, int[] conversions) throws JMSException |