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 2015/08/17 16:07:03 UTC
[1/4] camel git commit: Fixed AdviceWithRouteBuilder's remove with
selectLast
Repository: camel
Updated Branches:
refs/heads/camel-2.15.x dcd5c527e -> 0622ad689
refs/heads/master d71ad13d4 -> 17657bf3a
Fixed AdviceWithRouteBuilder's remove with selectLast
The remove implementation wrongfully passed the selectFirst value for the selectLast parameter
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/00cf91c0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/00cf91c0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/00cf91c0
Branch: refs/heads/camel-2.15.x
Commit: 00cf91c052097dbb72f5330617152272ec186032
Parents: dcd5c52
Author: Raphael Parree <rp...@edc4it.com>
Authored: Mon Aug 17 11:57:36 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Aug 17 15:46:19 2015 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/builder/AdviceWithBuilder.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/00cf91c0/camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java
index b89ffa5..403d744 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java
@@ -149,7 +149,7 @@ public class AdviceWithBuilder<T extends ProcessorDefinition<?>> {
} else if (toString != null) {
builder.getAdviceWithTasks().add(AdviceWithTasks.removeByToString(route, toString, selectLast, selectFirst, selectFrom, selectTo, maxDeep));
} else if (type != null) {
- builder.getAdviceWithTasks().add(AdviceWithTasks.removeByType(route, type, selectFirst, selectFirst, selectFrom, selectTo, maxDeep));
+ builder.getAdviceWithTasks().add(AdviceWithTasks.removeByType(route, type, selectFirst, selectLast, selectFrom, selectTo, maxDeep));
}
}
[3/4] camel git commit: Fixed AdviceWithRouteBuilder's remove with
selectLast
Posted by da...@apache.org.
Fixed AdviceWithRouteBuilder's remove with selectLast
The remove implementation wrongfully passed the selectFirst value for the selectLast parameter
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c1360673
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c1360673
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c1360673
Branch: refs/heads/master
Commit: c1360673a472a8ae6b8674992f95f799f866a79f
Parents: d71ad13
Author: Raphael Parree <rp...@edc4it.com>
Authored: Mon Aug 17 11:57:36 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Aug 17 15:48:32 2015 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/builder/AdviceWithBuilder.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c1360673/camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java
index b89ffa5..403d744 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java
@@ -149,7 +149,7 @@ public class AdviceWithBuilder<T extends ProcessorDefinition<?>> {
} else if (toString != null) {
builder.getAdviceWithTasks().add(AdviceWithTasks.removeByToString(route, toString, selectLast, selectFirst, selectFrom, selectTo, maxDeep));
} else if (type != null) {
- builder.getAdviceWithTasks().add(AdviceWithTasks.removeByType(route, type, selectFirst, selectFirst, selectFrom, selectTo, maxDeep));
+ builder.getAdviceWithTasks().add(AdviceWithTasks.removeByType(route, type, selectFirst, selectLast, selectFrom, selectTo, maxDeep));
}
}
[2/4] camel git commit: Fixed AdviceWithRouteBuilder's remove with
selectLas. Fixes #593
Posted by da...@apache.org.
Fixed AdviceWithRouteBuilder's remove with selectLas. Fixes #593
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0622ad68
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0622ad68
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0622ad68
Branch: refs/heads/camel-2.15.x
Commit: 0622ad6890a1979f9114a276b068772e307b979d
Parents: 00cf91c
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Aug 17 15:48:03 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Aug 17 15:48:03 2015 +0200
----------------------------------------------------------------------
.../main/java/org/apache/camel/builder/AdviceWithBuilder.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/0622ad68/camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java
index 403d744..75d643d 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java
@@ -147,7 +147,7 @@ public class AdviceWithBuilder<T extends ProcessorDefinition<?>> {
if (id != null) {
builder.getAdviceWithTasks().add(AdviceWithTasks.removeById(route, id, selectFirst, selectLast, selectFrom, selectTo, maxDeep));
} else if (toString != null) {
- builder.getAdviceWithTasks().add(AdviceWithTasks.removeByToString(route, toString, selectLast, selectFirst, selectFrom, selectTo, maxDeep));
+ builder.getAdviceWithTasks().add(AdviceWithTasks.removeByToString(route, toString, selectFirst, selectLast, selectFrom, selectTo, maxDeep));
} else if (type != null) {
builder.getAdviceWithTasks().add(AdviceWithTasks.removeByType(route, type, selectFirst, selectLast, selectFrom, selectTo, maxDeep));
}
@@ -164,7 +164,7 @@ public class AdviceWithBuilder<T extends ProcessorDefinition<?>> {
if (id != null) {
builder.getAdviceWithTasks().add(AdviceWithTasks.beforeById(route, id, answer, selectFirst, selectLast, selectFrom, selectTo, maxDeep));
} else if (toString != null) {
- builder.getAdviceWithTasks().add(AdviceWithTasks.beforeByToString(route, toString, answer, selectLast, selectFirst, selectFrom, selectTo, maxDeep));
+ builder.getAdviceWithTasks().add(AdviceWithTasks.beforeByToString(route, toString, answer, selectFirst, selectLast, selectFrom, selectTo, maxDeep));
} else if (type != null) {
builder.getAdviceWithTasks().add(AdviceWithTasks.beforeByType(route, type, answer, selectFirst, selectLast, selectFrom, selectTo, maxDeep));
}
@@ -182,7 +182,7 @@ public class AdviceWithBuilder<T extends ProcessorDefinition<?>> {
if (id != null) {
builder.getAdviceWithTasks().add(AdviceWithTasks.afterById(route, id, answer, selectFirst, selectLast, selectFrom, selectTo, maxDeep));
} else if (toString != null) {
- builder.getAdviceWithTasks().add(AdviceWithTasks.afterByToString(route, toString, answer, selectLast, selectFirst, selectFrom, selectTo, maxDeep));
+ builder.getAdviceWithTasks().add(AdviceWithTasks.afterByToString(route, toString, answer, selectFirst, selectLast, selectFrom, selectTo, maxDeep));
} else if (type != null) {
builder.getAdviceWithTasks().add(AdviceWithTasks.afterByType(route, type, answer, selectFirst, selectLast, selectFrom, selectTo, maxDeep));
}
[4/4] camel git commit: Fixed AdviceWithRouteBuilder's remove with
selectLas. Fixes #593
Posted by da...@apache.org.
Fixed AdviceWithRouteBuilder's remove with selectLas. Fixes #593
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/17657bf3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/17657bf3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/17657bf3
Branch: refs/heads/master
Commit: 17657bf3a6a679b6d203c9c915c5a7f4c7752ae5
Parents: c136067
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Aug 17 15:48:03 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Aug 17 15:48:37 2015 +0200
----------------------------------------------------------------------
.../main/java/org/apache/camel/builder/AdviceWithBuilder.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/17657bf3/camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java
index 403d744..75d643d 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java
@@ -147,7 +147,7 @@ public class AdviceWithBuilder<T extends ProcessorDefinition<?>> {
if (id != null) {
builder.getAdviceWithTasks().add(AdviceWithTasks.removeById(route, id, selectFirst, selectLast, selectFrom, selectTo, maxDeep));
} else if (toString != null) {
- builder.getAdviceWithTasks().add(AdviceWithTasks.removeByToString(route, toString, selectLast, selectFirst, selectFrom, selectTo, maxDeep));
+ builder.getAdviceWithTasks().add(AdviceWithTasks.removeByToString(route, toString, selectFirst, selectLast, selectFrom, selectTo, maxDeep));
} else if (type != null) {
builder.getAdviceWithTasks().add(AdviceWithTasks.removeByType(route, type, selectFirst, selectLast, selectFrom, selectTo, maxDeep));
}
@@ -164,7 +164,7 @@ public class AdviceWithBuilder<T extends ProcessorDefinition<?>> {
if (id != null) {
builder.getAdviceWithTasks().add(AdviceWithTasks.beforeById(route, id, answer, selectFirst, selectLast, selectFrom, selectTo, maxDeep));
} else if (toString != null) {
- builder.getAdviceWithTasks().add(AdviceWithTasks.beforeByToString(route, toString, answer, selectLast, selectFirst, selectFrom, selectTo, maxDeep));
+ builder.getAdviceWithTasks().add(AdviceWithTasks.beforeByToString(route, toString, answer, selectFirst, selectLast, selectFrom, selectTo, maxDeep));
} else if (type != null) {
builder.getAdviceWithTasks().add(AdviceWithTasks.beforeByType(route, type, answer, selectFirst, selectLast, selectFrom, selectTo, maxDeep));
}
@@ -182,7 +182,7 @@ public class AdviceWithBuilder<T extends ProcessorDefinition<?>> {
if (id != null) {
builder.getAdviceWithTasks().add(AdviceWithTasks.afterById(route, id, answer, selectFirst, selectLast, selectFrom, selectTo, maxDeep));
} else if (toString != null) {
- builder.getAdviceWithTasks().add(AdviceWithTasks.afterByToString(route, toString, answer, selectLast, selectFirst, selectFrom, selectTo, maxDeep));
+ builder.getAdviceWithTasks().add(AdviceWithTasks.afterByToString(route, toString, answer, selectFirst, selectLast, selectFrom, selectTo, maxDeep));
} else if (type != null) {
builder.getAdviceWithTasks().add(AdviceWithTasks.afterByType(route, type, answer, selectFirst, selectLast, selectFrom, selectTo, maxDeep));
}