Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id E03B9200BBD for ; Tue, 8 Nov 2016 10:33:06 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id DEABB160B0C; Tue, 8 Nov 2016 09:33:06 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 32D1A160AFA for ; Tue, 8 Nov 2016 10:33:06 +0100 (CET) Received: (qmail 17323 invoked by uid 500); 8 Nov 2016 09:33:05 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 17305 invoked by uid 99); 8 Nov 2016 09:33:05 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Nov 2016 09:33:05 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 206AEE0AF6; Tue, 8 Nov 2016 09:33:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: davsclaus@apache.org To: commits@camel.apache.org Date: Tue, 08 Nov 2016 09:33:05 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] camel git commit: Polished. This closes #1242 archived-at: Tue, 08 Nov 2016 09:33:07 -0000 Repository: camel Updated Branches: refs/heads/master 7e355e0d0 -> e4b1a5213 Polished. This closes #1242 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e4b1a521 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e4b1a521 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e4b1a521 Branch: refs/heads/master Commit: e4b1a5213876181f854ff55c21b04d08a3c6cb85 Parents: 5607878 Author: Claus Ibsen Authored: Tue Nov 8 10:30:35 2016 +0100 Committer: Claus Ibsen Committed: Tue Nov 8 10:30:50 2016 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/camel/impl/RouteIdFactory.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/e4b1a521/camel-core/src/main/java/org/apache/camel/impl/RouteIdFactory.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/impl/RouteIdFactory.java b/camel-core/src/main/java/org/apache/camel/impl/RouteIdFactory.java index fda6127..5fdb51c 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/RouteIdFactory.java +++ b/camel-core/src/main/java/org/apache/camel/impl/RouteIdFactory.java @@ -63,11 +63,10 @@ public class RouteIdFactory implements NodeIdFactory { } return defaultNodeIdFactory.createId(definition); - } /** - * Extract id from direct/seda route. + * Extract id from routes */ private Optional extractId(RouteDefinition routeDefinition) { List inputs = routeDefinition.getInputs(); @@ -79,6 +78,7 @@ public class RouteIdFactory implements NodeIdFactory { FromDefinition from = inputs.get(0); String uri = from.getUri(); + // we want to use the context-path of the route int colon = uri.indexOf(':'); if (colon > 0) {