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/09/25 16:28:49 UTC
[1/2] camel git commit: CAMEL-9164: Fixed WARN logging during stop
camel in blueprint due error handler mbean not there.
Repository: camel
Updated Branches:
refs/heads/master 74b149850 -> 2b6feb622
CAMEL-9164: Fixed WARN logging during stop camel in blueprint due error handler mbean not there.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ba77a996
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ba77a996
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ba77a996
Branch: refs/heads/master
Commit: ba77a9967546ced48dbb2ecfd38ecfa5937f9646
Parents: 74b1498
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Sep 25 14:45:23 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Sep 25 14:45:23 2015 +0200
----------------------------------------------------------------------
.../apache/camel/builder/ErrorHandlerBuilderRef.java | 2 +-
.../management/DefaultManagementNamingStrategy.java | 13 ++++++++++---
2 files changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ba77a996/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java b/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
index 4d06b7f..769ea34 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
@@ -134,7 +134,7 @@ public class ErrorHandlerBuilderRef extends ErrorHandlerBuilderSupport {
}
} else {
// use specific configured error handler
- answer = routeContext.mandatoryLookup(ref, ErrorHandlerBuilder.class);
+ answer = routeContext.lookup(ref, ErrorHandlerBuilder.class);
}
return answer;
http://git-wip-us.apache.org/repos/asf/camel/blob/ba77a996/camel-core/src/main/java/org/apache/camel/management/DefaultManagementNamingStrategy.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementNamingStrategy.java b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementNamingStrategy.java
index a9c8a70..07d11bd 100644
--- a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementNamingStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementNamingStrategy.java
@@ -33,6 +33,7 @@ import org.apache.camel.Producer;
import org.apache.camel.Route;
import org.apache.camel.Service;
import org.apache.camel.StaticService;
+import org.apache.camel.builder.DefaultErrorHandlerBuilder;
import org.apache.camel.builder.ErrorHandlerBuilderRef;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.EventNotifier;
@@ -165,7 +166,10 @@ public class DefaultManagementNamingStrategy implements ManagementNamingStrategy
// it has not then its an indirection and we should do some work to lookup the real builder
ref = builderRef.getRef();
- builder = ErrorHandlerBuilderRef.lookupErrorHandlerBuilder(routeContext, builderRef.getRef());
+ ErrorHandlerFactory refBuilder = ErrorHandlerBuilderRef.lookupErrorHandlerBuilder(routeContext, builderRef.getRef());
+ if (refBuilder != null) {
+ builder = refBuilder;
+ }
// must do a 2nd lookup in case this is also a reference
// (this happens with spring DSL using errorHandlerRef on <route> as it gets a bit
@@ -174,8 +178,11 @@ public class DefaultManagementNamingStrategy implements ManagementNamingStrategy
builderRef = (ErrorHandlerBuilderRef) builder;
// does it refer to a non default error handler then do a 2nd lookup
if (!builderRef.getRef().equals(ErrorHandlerBuilderRef.DEFAULT_ERROR_HANDLER_BUILDER)) {
- builder = ErrorHandlerBuilderRef.lookupErrorHandlerBuilder(routeContext, builderRef.getRef());
- ref = builderRef.getRef();
+ refBuilder = ErrorHandlerBuilderRef.lookupErrorHandlerBuilder(routeContext, builderRef.getRef());
+ if (refBuilder != null) {
+ ref = builderRef.getRef();
+ builder = refBuilder;
+ }
}
}
}
[2/2] camel git commit: CAMEL-9164: Fixed WARN logging during stop
camel in blueprint due error handler mbean not there.
Posted by da...@apache.org.
CAMEL-9164: Fixed WARN logging during stop camel in blueprint due error handler mbean not there.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2b6feb62
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2b6feb62
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2b6feb62
Branch: refs/heads/master
Commit: 2b6feb622ece62c077991953218e431a9acf7cf8
Parents: ba77a99
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Sep 25 16:26:39 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Sep 25 16:26:39 2015 +0200
----------------------------------------------------------------------
.../camel/builder/ErrorHandlerBuilderRef.java | 18 +++++++++++++++++-
.../DefaultManagementNamingStrategy.java | 4 ++--
2 files changed, 19 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2b6feb62/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java b/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
index 769ea34..ddb1948 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
@@ -99,6 +99,18 @@ public class ErrorHandlerBuilderRef extends ErrorHandlerBuilderSupport {
* @return the error handler
*/
public static ErrorHandlerFactory lookupErrorHandlerBuilder(RouteContext routeContext, String ref) {
+ return lookupErrorHandlerBuilder(routeContext, ref, true);
+ }
+
+ /**
+ * Lookup the error handler by the given ref
+ *
+ * @param routeContext the route context
+ * @param ref reference id for the error handler
+ * @param mandatory whether the error handler must exists, if not a {@link org.apache.camel.NoSuchBeanException} is thrown
+ * @return the error handler
+ */
+ public static ErrorHandlerFactory lookupErrorHandlerBuilder(RouteContext routeContext, String ref, boolean mandatory) {
ErrorHandlerFactory answer;
// if the ref is the default then we do not have any explicit error handler configured
@@ -134,7 +146,11 @@ public class ErrorHandlerBuilderRef extends ErrorHandlerBuilderSupport {
}
} else {
// use specific configured error handler
- answer = routeContext.lookup(ref, ErrorHandlerBuilder.class);
+ if (mandatory) {
+ answer = routeContext.mandatoryLookup(ref, ErrorHandlerBuilder.class);
+ } else {
+ answer = routeContext.lookup(ref, ErrorHandlerBuilder.class);
+ }
}
return answer;
http://git-wip-us.apache.org/repos/asf/camel/blob/2b6feb62/camel-core/src/main/java/org/apache/camel/management/DefaultManagementNamingStrategy.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementNamingStrategy.java b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementNamingStrategy.java
index 07d11bd..0a03e4d 100644
--- a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementNamingStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementNamingStrategy.java
@@ -166,7 +166,7 @@ public class DefaultManagementNamingStrategy implements ManagementNamingStrategy
// it has not then its an indirection and we should do some work to lookup the real builder
ref = builderRef.getRef();
- ErrorHandlerFactory refBuilder = ErrorHandlerBuilderRef.lookupErrorHandlerBuilder(routeContext, builderRef.getRef());
+ ErrorHandlerFactory refBuilder = ErrorHandlerBuilderRef.lookupErrorHandlerBuilder(routeContext, builderRef.getRef(), false);
if (refBuilder != null) {
builder = refBuilder;
}
@@ -178,7 +178,7 @@ public class DefaultManagementNamingStrategy implements ManagementNamingStrategy
builderRef = (ErrorHandlerBuilderRef) builder;
// does it refer to a non default error handler then do a 2nd lookup
if (!builderRef.getRef().equals(ErrorHandlerBuilderRef.DEFAULT_ERROR_HANDLER_BUILDER)) {
- refBuilder = ErrorHandlerBuilderRef.lookupErrorHandlerBuilder(routeContext, builderRef.getRef());
+ refBuilder = ErrorHandlerBuilderRef.lookupErrorHandlerBuilder(routeContext, builderRef.getRef(), false);
if (refBuilder != null) {
ref = builderRef.getRef();
builder = refBuilder;