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 2017/10/06 11:16:58 UTC
[1/2] camel git commit: Polished
Repository: camel
Updated Branches:
refs/heads/master fb8d3acd0 -> ac17984f8
Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cda4cb6a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cda4cb6a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cda4cb6a
Branch: refs/heads/master
Commit: cda4cb6a8ba4055160037f0bcef28bc5be9f32df
Parents: fb8d3ac
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Oct 6 12:08:22 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Oct 6 12:08:22 2017 +0200
----------------------------------------------------------------------
.../main/java/org/apache/camel/model/InterceptDefinition.java | 5 +----
.../main/java/org/apache/camel/model/ProcessorDefinition.java | 2 +-
2 files changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/cda4cb6a/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java b/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java
index 1196133..5acd5b6 100644
--- a/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java
@@ -88,10 +88,7 @@ public class InterceptDefinition extends OutputDefinition<InterceptDefinition> {
if (interceptedTarget != null) {
// wrap in a pipeline so we continue routing to the next
- List<Processor> list = new ArrayList<Processor>(2);
- list.add(output);
- list.add(interceptedTarget);
- return new Pipeline(context, list);
+ return Pipeline.newInstance(context, output, interceptedTarget);
} else {
return output;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/cda4cb6a/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
index 500b043..0ac2474 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
@@ -411,7 +411,7 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
* to using a {@link Pipeline} but derived classes could change the behaviour
*/
protected Processor createCompositeProcessor(RouteContext routeContext, List<Processor> list) throws Exception {
- return new Pipeline(routeContext.getCamelContext(), list);
+ return Pipeline.newInstance(routeContext.getCamelContext(), list);
}
/**
[2/2] camel git commit: Upgrade ActiveMQ
Posted by da...@apache.org.
Upgrade ActiveMQ
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ac17984f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ac17984f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ac17984f
Branch: refs/heads/master
Commit: ac17984f89c0e27d504b621e1f8d851bc9077076
Parents: cda4cb6
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Oct 6 12:20:33 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Oct 6 12:20:33 2017 +0200
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ac17984f/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 781f8f0..1741d46 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -40,7 +40,7 @@
<!-- dependency versions -->
<abdera-version>1.1.3</abdera-version>
<!-- Note that activemq dependency is only used for testing! -->
- <activemq-version>5.15.0</activemq-version>
+ <activemq-version>5.15.1</activemq-version>
<activemq-artemis-version>2.3.0</activemq-artemis-version>
<aether-version>1.0.2.v20150114</aether-version>
<ahc-version>2.0.36</ahc-version>