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:34:22 UTC
[1/2] camel git commit: Fix potential NPE
Repository: camel
Updated Branches:
refs/heads/master b2707c8d2 -> 8affc0b7c
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/f16e24c2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f16e24c2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f16e24c2
Branch: refs/heads/master
Commit: f16e24c22f764e412686d3562f2411958972b5c7
Parents: b2707c8
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Apr 18 11:33:26 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Apr 18 11:33:26 2015 +0200
----------------------------------------------------------------------
.../org/apache/camel/management/DefaultManagementAgent.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f16e24c2/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 bc228e1..433dd21 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
@@ -281,8 +281,9 @@ public class DefaultManagementAgent extends ServiceSupport implements Management
}
public <T> T newProxyClient(ObjectName name, Class<T> mbean) {
- if (server != null && server.isRegistered(name)) {
- return MBeanServerInvocationHandler.newProxyInstance(server, name, mbean, false);
+ if (isRegistered(name)) {
+ ObjectName on = mbeansRegistered.get(name);
+ return MBeanServerInvocationHandler.newProxyInstance(server, on != null ? on : name, mbean, false);
} else {
return null;
}
[2/2] camel git commit: Upgrade cobertura plugin
Posted by da...@apache.org.
Upgrade cobertura plugin
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8affc0b7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8affc0b7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8affc0b7
Branch: refs/heads/master
Commit: 8affc0b7cd9b7e4cc94255a4a5df255833eb1688
Parents: f16e24c
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Apr 18 11:37:19 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Apr 18 11:37:19 2015 +0200
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/8affc0b7/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index fcb98b6..8830f9c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -120,7 +120,7 @@
<commons-pool-version>1.6</commons-pool-version>
<commons-vfs2-version>2.0</commons-vfs2-version>
<concurrentlinkedhashmap.version>1.4.2</concurrentlinkedhashmap.version>
- <cobertura-maven-plugin-version>2.5.2</cobertura-maven-plugin-version>
+ <cobertura-maven-plugin-version>2.7</cobertura-maven-plugin-version>
<cxf-version>3.0.4</cxf-version>
<cxf-version-range>[2.7,4.0)</cxf-version-range>
<cxf-xjc-utils-version>3.0.2</cxf-xjc-utils-version>