Repository: camel Updated Branches: refs/heads/camel-2.16.x 5005e3f74 -> e791fc277
[CAMEL-9245] camel-paho - Endpoint should allow a flexible naming. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e791fc27 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e791fc27 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e791fc27 Branch: refs/heads/camel-2.16.x Commit: e791fc27756fddce2eaa759c86250c8c5e7f9a0f Parents: 5005e3f Author: Henryk Konsek <hekon...@gmail.com> Authored: Sun Oct 25 21:39:36 2015 +0100 Committer: Henryk Konsek <hekon...@gmail.com> Committed: Sun Oct 25 21:39:36 2015 +0100 ---------------------------------------------------------------------- .../java/org/apache/camel/component/paho/PahoComponent.java | 2 +- .../java/org/apache/camel/component/paho/PahoEndpoint.java | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/e791fc27/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoComponent.java b/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoComponent.java index 232d38e..fd11188 100644 --- a/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoComponent.java +++ b/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoComponent.java @@ -34,7 +34,7 @@ public class PahoComponent extends UriEndpointComponent { @Override protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception { - PahoEndpoint answer = new PahoEndpoint(uri, this); + PahoEndpoint answer = new PahoEndpoint(uri, remaining, this); if (brokerUrl != null) { answer.setBrokerUrl(brokerUrl); http://git-wip-us.apache.org/repos/asf/camel/blob/e791fc27/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoEndpoint.java b/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoEndpoint.java index 5ca943a..2b38b2e 100644 --- a/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoEndpoint.java +++ b/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoEndpoint.java @@ -73,11 +73,9 @@ public class PahoEndpoint extends DefaultEndpoint { private transient MqttClient client; - public PahoEndpoint(String uri, Component component) { + public PahoEndpoint(String uri, String topic, Component component) { super(uri, component); - if (topic == null) { - topic = uri.substring(7); - } + this.topic = topic; } @Override