From de813471685baee94bd020fce181b6dc697ef4f9 Mon Sep 17 00:00:00 2001
From: "Rafael H. Schloming" <rhs@apache.org>
Date: Fri, 20 Mar 2009 05:29:10 +0000
Subject: Fix for QPID-1761 and QPID-1762: made BBEncoder.grow() flip the
 buffer before copying; added a BBEncoder test; made unrecognized mime types
 default to BytesMessage; added logging of exception root cause to AMQSession;
 fixed miscelaneous test failures

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@756328 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/qpid/client/AMQSession.java    |  1 +
 .../client/message/MessageFactoryRegistry.java     | 43 ++++++++++------------
 2 files changed, 20 insertions(+), 24 deletions(-)

(limited to 'java/client/src/main')

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);
     }
 }
-- 
cgit v1.2.1