You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/03/20 07:11:36 UTC
[1/2] camel git commit: CAMEL-8317: XML DSL - Allow to use bean
property style to configure endpoint options
Repository: camel
Updated Branches:
refs/heads/camel-2.15.x 89cb7e6cc -> c1099b450
refs/heads/master 368be192d -> 10c4e1bc5
CAMEL-8317: XML DSL - Allow to use bean property style to configure endpoint options
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/10c4e1bc
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/10c4e1bc
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/10c4e1bc
Branch: refs/heads/master
Commit: 10c4e1bc56721bf17312753ea38f2d2fb248f641
Parents: 368be19
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Mar 20 07:13:05 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Mar 20 07:13:05 2015 +0100
----------------------------------------------------------------------
.../camel/core/xml/AbstractCamelEndpointFactoryBean.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/10c4e1bc/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelEndpointFactoryBean.java
----------------------------------------------------------------------
diff --git a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelEndpointFactoryBean.java b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelEndpointFactoryBean.java
index 7e9fd68..231faa0 100644
--- a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelEndpointFactoryBean.java
+++ b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelEndpointFactoryBean.java
@@ -49,10 +49,10 @@ public abstract class AbstractCamelEndpointFactoryBean extends AbstractCamelFact
public Endpoint getObject() throws Exception {
if (endpoint == null || !endpoint.isSingleton()) {
- // resolve placeholders
- this.uri = getCamelContext().resolvePropertyPlaceholders(uri);
- String target = createUri();
- endpoint = getCamelContext().getEndpoint(target);
+ // resolve placeholders (but leave the original uri unchanged)
+ String resolved = getCamelContext().resolvePropertyPlaceholders(uri);
+ String target = createUri(resolved);
+ this.endpoint = getCamelContext().getEndpoint(target);
if (endpoint == null) {
throw new NoSuchEndpointException(target);
}
@@ -112,7 +112,7 @@ public abstract class AbstractCamelEndpointFactoryBean extends AbstractCamelFact
this.properties = properties;
}
- private String createUri() throws Exception {
+ private String createUri(String uri) throws Exception {
if (properties == null || properties.isEmpty()) {
return uri;
} else {
[2/2] camel git commit: CAMEL-8317: XML DSL - Allow to use bean
property style to configure endpoint options
Posted by da...@apache.org.
CAMEL-8317: XML DSL - Allow to use bean property style to configure endpoint options
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c1099b45
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c1099b45
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c1099b45
Branch: refs/heads/camel-2.15.x
Commit: c1099b450a179e3a07d6cd22d046bc00effaa494
Parents: 89cb7e6
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Mar 20 07:13:05 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Mar 20 07:13:24 2015 +0100
----------------------------------------------------------------------
.../camel/core/xml/AbstractCamelEndpointFactoryBean.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c1099b45/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelEndpointFactoryBean.java
----------------------------------------------------------------------
diff --git a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelEndpointFactoryBean.java b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelEndpointFactoryBean.java
index 7e9fd68..231faa0 100644
--- a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelEndpointFactoryBean.java
+++ b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelEndpointFactoryBean.java
@@ -49,10 +49,10 @@ public abstract class AbstractCamelEndpointFactoryBean extends AbstractCamelFact
public Endpoint getObject() throws Exception {
if (endpoint == null || !endpoint.isSingleton()) {
- // resolve placeholders
- this.uri = getCamelContext().resolvePropertyPlaceholders(uri);
- String target = createUri();
- endpoint = getCamelContext().getEndpoint(target);
+ // resolve placeholders (but leave the original uri unchanged)
+ String resolved = getCamelContext().resolvePropertyPlaceholders(uri);
+ String target = createUri(resolved);
+ this.endpoint = getCamelContext().getEndpoint(target);
if (endpoint == null) {
throw new NoSuchEndpointException(target);
}
@@ -112,7 +112,7 @@ public abstract class AbstractCamelEndpointFactoryBean extends AbstractCamelFact
this.properties = properties;
}
- private String createUri() throws Exception {
+ private String createUri(String uri) throws Exception {
if (properties == null || properties.isEmpty()) {
return uri;
} else {