camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [1/3] git commit: CAMEL-6790: Fixed camel-blueprint and camel-spring refresh issue can cause namespace handler to not trigger.
Date Mon, 07 Oct 2013 10:45:27 GMT
Updated Branches:
  refs/heads/camel-2.11.x bd2c3f6d2 -> 3334a78f6
  refs/heads/camel-2.12.x be939d062 -> 63423cc93
  refs/heads/master dce6de691 -> 5212f9abc


CAMEL-6790: Fixed camel-blueprint and camel-spring refresh issue can cause namespace handler
to not trigger.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5212f9ab
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5212f9ab
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5212f9ab

Branch: refs/heads/master
Commit: 5212f9abc2425cbe1dc25bed8ac6f93e26d265f2
Parents: dce6de6
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Mon Oct 7 12:44:19 2013 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Mon Oct 7 12:44:19 2013 +0200

----------------------------------------------------------------------
 .../org/apache/camel/blueprint/handler/CamelNamespaceHandler.java  | 2 +-
 .../org/apache/camel/spring/handler/CamelNamespaceHandler.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/5212f9ab/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
----------------------------------------------------------------------
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
index fe726e8..2f0e44b 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
@@ -181,7 +181,7 @@ public class CamelNamespaceHandler implements NamespaceHandler {
             // if no explicit id was set then use a default auto generated name
             CamelContextNameStrategy strategy = new DefaultCamelContextNameStrategy();
             contextId = strategy.getName();
-            element.setAttribute("id", contextId);
+            element.setAttributeNS(null, "id", contextId);
             implicitId = true;
         }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/5212f9ab/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
b/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
index 5c25414..957c792 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
+++ b/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
@@ -293,7 +293,7 @@ public class CamelNamespaceHandler extends NamespaceHandlerSupport {
                 // if no explicit id was set then use a default auto generated name
                 CamelContextNameStrategy strategy = new DefaultCamelContextNameStrategy();
                 contextId = strategy.getName();
-                element.setAttribute("id", contextId);
+                element.setAttributeNS(null, "id", contextId);
                 implicitId = true;
             }
 


Mime
View raw message