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 2016/01/15 13:21:04 UTC
[1/2] camel git commit: [CAMEL-9518] Swagger may see non-camel MBeans
Repository: camel
Updated Branches:
refs/heads/camel-2.16.x 57c75380b -> 61c07897e
refs/heads/master 98a863a1b -> 812417744
[CAMEL-9518] Swagger may see non-camel MBeans
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/61c07897
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/61c07897
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/61c07897
Branch: refs/heads/camel-2.16.x
Commit: 61c07897ea32e4de9b3444bcf041c8b665faca9c
Parents: 57c7538
Author: Thomas Diesler <th...@jboss.com>
Authored: Fri Jan 15 12:40:46 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Jan 15 13:20:28 2016 +0100
----------------------------------------------------------------------
.../org/apache/camel/swagger/RestSwaggerSupport.java | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/61c07897/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java
index ec4b41a..58aeb05 100644
--- a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java
+++ b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java
@@ -22,6 +22,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
+
+import javax.management.AttributeNotFoundException;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -153,15 +155,20 @@ public class RestSwaggerSupport {
MBeanServer server = ManagementFactory.getPlatformMBeanServer();
Set<ObjectName> names = server.queryNames(new ObjectName("*:type=context,*"), null);
for (ObjectName on : names) {
+
String id = on.getKeyProperty("name");
if (id.startsWith("\"") && id.endsWith("\"")) {
id = id.substring(1, id.length() - 1);
}
// filter out older Camel versions as this requires Camel 2.15 or better (rest-dsl)
- String version = (String) server.getAttribute(on, "CamelVersion");
- if (CamelVersionHelper.isGE("2.15.0", version)) {
- answer.add(id);
+ try {
+ String version = (String) server.getAttribute(on, "CamelVersion");
+ if (CamelVersionHelper.isGE("2.15.0", version)) {
+ answer.add(id);
+ }
+ } catch (AttributeNotFoundException ex) {
+ // ignore
}
}
return answer;
[2/2] camel git commit: [CAMEL-9518] Swagger may see non-camel MBeans
Posted by da...@apache.org.
[CAMEL-9518] Swagger may see non-camel MBeans
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/81241774
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/81241774
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/81241774
Branch: refs/heads/master
Commit: 81241774494faed8d3df890dfc7fb00f5d29f779
Parents: 98a863a
Author: Thomas Diesler <th...@jboss.com>
Authored: Fri Jan 15 12:40:46 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Jan 15 13:20:47 2016 +0100
----------------------------------------------------------------------
.../org/apache/camel/swagger/RestSwaggerSupport.java | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/81241774/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java
index 07f2135..f96e398 100644
--- a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java
+++ b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java
@@ -22,6 +22,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
+
+import javax.management.AttributeNotFoundException;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -157,15 +159,20 @@ public class RestSwaggerSupport {
MBeanServer server = ManagementFactory.getPlatformMBeanServer();
Set<ObjectName> names = server.queryNames(new ObjectName("*:type=context,*"), null);
for (ObjectName on : names) {
+
String id = on.getKeyProperty("name");
if (id.startsWith("\"") && id.endsWith("\"")) {
id = id.substring(1, id.length() - 1);
}
// filter out older Camel versions as this requires Camel 2.15 or better (rest-dsl)
- String version = (String) server.getAttribute(on, "CamelVersion");
- if (CamelVersionHelper.isGE("2.15.0", version)) {
- answer.add(id);
+ try {
+ String version = (String) server.getAttribute(on, "CamelVersion");
+ if (CamelVersionHelper.isGE("2.15.0", version)) {
+ answer.add(id);
+ }
+ } catch (AttributeNotFoundException ex) {
+ // ignore
}
}
return answer;