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/18 11:27:41 UTC
camel git commit: Fix potential NPE
Repository: camel
Updated Branches:
refs/heads/master 4a7d4f67e -> b2707c8d2
Fix potential NPE
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b2707c8d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b2707c8d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b2707c8d
Branch: refs/heads/master
Commit: b2707c8d20cffc3592aa85b92e519a01e2b05d74
Parents: 4a7d4f6
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Apr 18 11:27:03 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Apr 18 11:27:03 2015 +0200
----------------------------------------------------------------------
.../org/apache/camel/management/DefaultManagementAgent.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b2707c8d/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
index dcad99f..bc228e1 100644
--- a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
@@ -272,13 +272,16 @@ public class DefaultManagementAgent extends ServiceSupport implements Management
}
public boolean isRegistered(ObjectName name) {
+ if (server == null) {
+ return false;
+ }
ObjectName on = mbeansRegistered.get(name);
return (on != null && server.isRegistered(on))
|| server.isRegistered(name);
}
public <T> T newProxyClient(ObjectName name, Class<T> mbean) {
- if (server.isRegistered(name)) {
+ if (server != null && server.isRegistered(name)) {
return MBeanServerInvocationHandler.newProxyInstance(server, name, mbean, false);
} else {
return null;