CAMEL-8226 Deprecated feature dataSourceRef not working correctly If you try to create more than one of endpoint from SqlComponent with specifying dataSourceRef option, it doesn't remove dataSourceRef option from URL on 2nd attempt as dataSource object is already populated on 1st attempt, causes org.apache.camel.ResolveEndpointFailedException
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c95fe973 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c95fe973 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c95fe973 Branch: refs/heads/camel-2.13.x Commit: c95fe97319f7a1d5e1324c0478246c255bbc8dd6 Parents: 4ab33e8 Author: Tomohisa Igarashi <tm.igara...@gmail.com> Authored: Tue Feb 10 16:45:36 2015 +0900 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Feb 10 09:19:29 2015 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/camel/component/sql/SqlComponent.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/c95fe973/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlComponent.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlComponent.java index 145c98b..a4eb816 100755 --- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlComponent.java +++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlComponent.java @@ -49,9 +49,8 @@ public class SqlComponent extends UriEndpointComponent { } //TODO cmueller: remove the 'dataSourceRef' lookup in Camel 3.0 - if (dataSource == null) { - String dataSourceRef = getAndRemoveParameter(parameters, "dataSourceRef", String.class); - if (dataSourceRef != null) { + String dataSourceRef = getAndRemoveParameter(parameters, "dataSourceRef", String.class); + if (dataSource == null && dataSourceRef != null) { dataSource = CamelContextHelper.mandatoryLookup(getCamelContext(), dataSourceRef, DataSource.class); } }
