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/04/17 12:26:59 UTC
[2/2] camel git commit: Fixed potential NPE if JMX not enabled
Fixed potential NPE if JMX not enabled
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8314bfe7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8314bfe7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8314bfe7
Branch: refs/heads/master
Commit: 8314bfe7a976bb42afc3bfd7c34591d83cbed3d9
Parents: c65b632
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Apr 17 11:41:56 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Apr 17 11:59:06 2015 +0200
----------------------------------------------------------------------
.../org/apache/camel/impl/DefaultCamelContext.java | 15 +++++++++++++++
1 file changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/8314bfe7/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index 1152600..bbc3377 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -733,6 +733,11 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
}
public <T extends ManagedProcessorMBean> T getManagedProcessor(String id, Class<T> type) {
+ // jmx must be enabled
+ if (getManagementStrategy().getManagementAgent() == null) {
+ return null;
+ }
+
Processor processor = getProcessor(id);
ProcessorDefinition def = getProcessorDefinition(id);
@@ -749,6 +754,11 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
}
public <T extends ManagedRouteMBean> T getManagedRoute(String routeId, Class<T> type) {
+ // jmx must be enabled
+ if (getManagementStrategy().getManagementAgent() == null) {
+ return null;
+ }
+
Route route = getRoute(routeId);
if (route != null) {
@@ -764,6 +774,11 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
}
public ManagedCamelContextMBean getManagedCamelContext() {
+ // jmx must be enabled
+ if (getManagementStrategy().getManagementAgent() == null) {
+ return null;
+ }
+
try {
ObjectName on = getManagementStrategy().getManagementNamingStrategy().getObjectNameForCamelContext(this);
return getManagementStrategy().getManagementAgent().newProxyClient(on, ManagedCamelContextMBean.class);