camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bvah...@apache.org
Subject git commit: CAMEL-7208: Fixed the 2 broken tests being backported to the 2.12.x branch. The failure is a side effect of CAMEL-6938 not being backported to the 2.12.x branch.
Date Sun, 16 Feb 2014 19:08:16 GMT
Repository: camel
Updated Branches:
  refs/heads/camel-2.12.x 7c7c86fd4 -> daac2ba31


CAMEL-7208: Fixed the 2 broken tests being backported to the 2.12.x
branch. The failure is a side effect of CAMEL-6938 not being backported
to the 2.12.x branch.

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

Branch: refs/heads/camel-2.12.x
Commit: daac2ba319e25ede69697391943b432f69093a20
Parents: 7c7c86f
Author: Babak Vahdat <bvahdat@apache.org>
Authored: Sun Feb 16 20:05:44 2014 +0100
Committer: Babak Vahdat <bvahdat@apache.org>
Committed: Sun Feb 16 20:07:29 2014 +0100

----------------------------------------------------------------------
 ...lContextUpdateRoutesWithPropertyPlaceholdersFromXmlPTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/daac2ba3/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextUpdateRoutesWithPropertyPlaceholdersFromXmlPTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextUpdateRoutesWithPropertyPlaceholdersFromXmlPTest.java
b/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextUpdateRoutesWithPropertyPlaceholdersFromXmlPTest.java
index 1c98684..89c8124 100644
--- a/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextUpdateRoutesWithPropertyPlaceholdersFromXmlPTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextUpdateRoutesWithPropertyPlaceholdersFromXmlPTest.java
@@ -79,7 +79,7 @@ public class ManagedCamelContextUpdateRoutesWithPropertyPlaceholdersFromXmlPTest
                 + "</route>"
                 + "</routes>";
 
-        ObjectName on = ObjectName.getInstance("org.apache.camel:context=camel-1,type=context,name=\"camel-1\"");
+        ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=context,name=\"camel-1\"");
         mbeanServer.invoke(on, "addOrUpdateRoutesFromXml", new Object[]{xml}, new String[]{"java.lang.String"});
 
         // there should be 2 routes now
@@ -128,7 +128,7 @@ public class ManagedCamelContextUpdateRoutesWithPropertyPlaceholdersFromXmlPTest
                 + "</route>"
                 + "</routes>";
 
-        ObjectName on = ObjectName.getInstance("org.apache.camel:context=camel-1,type=context,name=\"camel-1\"");
+        ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=context,name=\"camel-1\"");
         mbeanServer.invoke(on, "addOrUpdateRoutesFromXml", new Object[]{xml, true}, new String[]{"java.lang.String",
"boolean"});
 
         // there should be 2 routes now


Mime
View raw message