svn commit: r1183622 - in /camel/branches/camel-2.8.x: ./ components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java components/camel-jms/src/test/java/org/apache/camel/component/jms/FromTextToBytesMessageTest.java

[davsclaus]

Author: davsclaus
Date: Sat Oct 15 10:56:56 2011
New Revision: 1183622

URL: http://svn.apache.org/viewvc?rev=1183622&view=rev
Log:
CAMEL-4540: Direct routing JMS to JMS now checks for jmsMessageType matches if 
configured on destination endpoint.

Added:
    
camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/FromTextToBytesMessageTest.java
      - copied unchanged from r1183621, 
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/FromTextToBytesMessageTest.java
Modified:
    camel/branches/camel-2.8.x/   (props changed)
    
camel/branches/camel-2.8.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
    svn:mergeinfo = /camel/trunk:1183621

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.8.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java?rev=1183622&r1=1183621&r2=1183622&view=diff
==============================================================================
--- 
camel/branches/camel-2.8.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
 (original)
+++ 
camel/branches/camel-2.8.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
 Sat Oct 15 10:56:56 2011
@@ -252,6 +252,24 @@ public class JmsBinding {
             JmsMessage jmsMessage = (JmsMessage)camelMessage;
             if (!jmsMessage.shouldCreateNewMessage() || force) {
                 answer = jmsMessage.getJmsMessage();
+
+                if (!force) {
+                    // answer must match endpoint type
+                    JmsMessageType type = endpoint != null ? 
endpoint.getConfiguration().getJmsMessageType() : null;
+                    if (type != null && answer != null) {
+                        if (type == JmsMessageType.Text) {
+                            answer = answer instanceof TextMessage ? answer : 
null;
+                        } else if (type == JmsMessageType.Bytes) {
+                            answer = answer instanceof BytesMessage ? answer : 
null;
+                        } else if (type == JmsMessageType.Map) {
+                            answer = answer instanceof MapMessage ? answer : 
null;
+                        } else if (type == JmsMessageType.Object) {
+                            answer = answer instanceof ObjectMessage ? answer 
: null;
+                        } else if (type == JmsMessageType.Stream) {
+                            answer = answer instanceof StreamMessage ? answer 
: null;
+                        }
+                    }
+                }
             }
         }