You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2011/09/20 01:38:30 UTC
svn commit: r1172900 - in /camel/branches/camel-2.8.x: ./
components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcRouteTest.java
Author: dkulp
Date: Mon Sep 19 23:38:30 2011
New Revision: 1172900
URL: http://svn.apache.org/viewvc?rev=1172900&view=rev
Log:
Merged revisions 1163150 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1163150 | davsclaus | 2011-08-30 05:17:10 -0400 (Tue, 30 Aug 2011) | 1 line
CAMEL-4350: camel-jdbc should use a linked map so the data is in order according to the ResultSet. Thanks to Mathieu for the patch.
........
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
camel/branches/camel-2.8.x/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcRouteTest.java
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java?rev=1172900&r1=1172899&r2=1172900&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java (original)
+++ camel/branches/camel-2.8.x/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java Mon Sep 19 23:38:30 2011
@@ -22,7 +22,7 @@ import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import javax.sql.DataSource;
@@ -194,7 +194,7 @@ public class JdbcProducer extends Defaul
List<Map<String, Object>> data = new ArrayList<Map<String, Object>>();
int rowNumber = 0;
while (rs.next() && (readSize == 0 || rowNumber < readSize)) {
- Map<String, Object> row = new HashMap<String, Object>();
+ Map<String, Object> row = new LinkedHashMap<String, Object>();
for (int i = 0; i < count; i++) {
int columnNumber = i + 1;
// use column label to get the name as it also handled SQL SELECT aliases
Modified: camel/branches/camel-2.8.x/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcRouteTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcRouteTest.java?rev=1172900&r1=1172899&r2=1172900&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcRouteTest.java (original)
+++ camel/branches/camel-2.8.x/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcRouteTest.java Mon Sep 19 23:38:30 2011
@@ -32,6 +32,10 @@ import org.springframework.jdbc.core.Jdb
import org.springframework.jdbc.datasource.DriverManagerDataSource;
/**
+ * Is used as base class for testing the jdbc component.
+ * <p><b>Don't</b> add new test methods; it's likely to break the sub-classes.
+ * <p>Sub-classes should override {@link #testJdbcRoutes()} unless they create routes that
+ * are semantically equivalent to what this class creates.
* @version
*/
public class JdbcRouteTest extends CamelTestSupport {