svn commit: r1129428 - in /camel/branches/camel-2.7.x: ./ components/camel-http/ components/camel-ibatis/src/test/java/org/apache/camel/component/ibatis/ components/camel-jms/src/main/java/org/apache/camel/component/jms/

[hadrian]

Author: hadrian
Date: Mon May 30 23:12:18 2011
New Revision: 1129428

URL: http://svn.apache.org/viewvc?rev=1129428&view=rev
Log:
CAMEL-3979. Port fixes to the 2.7.x branch

Modified:
    camel/branches/camel-2.7.x/   (props changed)
    camel/branches/camel-2.7.x/components/camel-http/   (props changed)
    
camel/branches/camel-2.7.x/components/camel-ibatis/src/test/java/org/apache/camel/component/ibatis/IBatisQueueTest.java
    
camel/branches/camel-2.7.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java

Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 30 23:12:18 2011
@@ -1 +1 @@
-/camel/trunk:1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1091518,1091771,1091799,1092068,1092577,1092667,1093978,1095405
+/camel/trunk:1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1091518,1091771,1091799,1092068,1092577,1092667,1093978,1095405,1102162,1104076

Propchange: camel/branches/camel-2.7.x/components/camel-http/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 30 23:12:18 2011
@@ -1 +1 @@
-/camel/trunk/components/camel-http:917526,1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1091518,1091771,1091799,1092068,1092577,1092667,1093978,1095405
+/camel/trunk/components/camel-http:917526,1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1091518,1091771,1091799,1092068,1092577,1092667,1093978,1095405,1102162,1104076

Modified: 
camel/branches/camel-2.7.x/components/camel-ibatis/src/test/java/org/apache/camel/component/ibatis/IBatisQueueTest.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-ibatis/src/test/java/org/apache/camel/component/ibatis/IBatisQueueTest.java?rev=1129428&r1=1129427&r2=1129428&view=diff
==============================================================================
--- 
camel/branches/camel-2.7.x/components/camel-ibatis/src/test/java/org/apache/camel/component/ibatis/IBatisQueueTest.java
 (original)
+++ 
camel/branches/camel-2.7.x/components/camel-ibatis/src/test/java/org/apache/camel/component/ibatis/IBatisQueueTest.java
 Mon May 30 23:12:18 2011
@@ -98,11 +98,12 @@ public class IBatisQueueTest extends Cam
     @Override
     @After
     public void tearDown() throws Exception {
-        super.tearDown();
         IBatisEndpoint endpoint = resolveMandatoryEndpoint("ibatis:Account", 
IBatisEndpoint.class);
         Connection connection = 
endpoint.getSqlMapClient().getDataSource().getConnection();
         Statement statement = connection.createStatement();
         statement.execute("drop table ACCOUNT");
         connection.close();
+
+        super.tearDown();
     }
 }

Modified: 
camel/branches/camel-2.7.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java?rev=1129428&r1=1129427&r2=1129428&view=diff
==============================================================================
--- 
camel/branches/camel-2.7.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
 (original)
+++ 
camel/branches/camel-2.7.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
 Mon May 30 23:12:18 2011
@@ -362,7 +362,7 @@ public class JmsProducer extends Default
 
     protected void setMessageId(Exchange exchange) {
         if (exchange.hasOut()) {
-            JmsMessage out = (JmsMessage) exchange.getOut();
+            JmsMessage out = exchange.getOut(JmsMessage.class);
             try {
                 if (out != null && out.getJmsMessage() != null) {
                     out.setMessageId(out.getJmsMessage().getJMSMessageID());