You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2014/08/23 08:23:07 UTC
[1/2] git commit: Display a warn message in the log if the heapdump
can't be created by the dev:dump-create command
Repository: karaf
Updated Branches:
refs/heads/karaf-3.0.x 575ec6d97 -> a2881fe11
Display a warn message in the log if the heapdump can't be created by the dev:dump-create command
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/cd4732b8
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/cd4732b8
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/cd4732b8
Branch: refs/heads/karaf-3.0.x
Commit: cd4732b8ddd455960ee3b25b339e90fe0c6c85be
Parents: 575ec6d
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Sat Aug 23 08:21:32 2014 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Sat Aug 23 08:21:32 2014 +0200
----------------------------------------------------------------------
diagnostic/core/pom.xml | 6 ++++++
.../karaf/diagnostic/core/internal/HeapDumpProvider.java | 7 +++++--
2 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/cd4732b8/diagnostic/core/pom.xml
----------------------------------------------------------------------
diff --git a/diagnostic/core/pom.xml b/diagnostic/core/pom.xml
index 488c3cd..034ce0d 100644
--- a/diagnostic/core/pom.xml
+++ b/diagnostic/core/pom.xml
@@ -54,6 +54,11 @@
<groupId>org.apache.karaf.features</groupId>
<artifactId>org.apache.karaf.features.core</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
</dependencies>
<build>
@@ -84,6 +89,7 @@
</Export-Package>
<Import-Package>
com.sun.management*;resolution:=optional,
+ org.slf4j*;resolution:=optional,
*
</Import-Package>
<Private-Package>
http://git-wip-us.apache.org/repos/asf/karaf/blob/cd4732b8/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/internal/HeapDumpProvider.java
----------------------------------------------------------------------
diff --git a/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/internal/HeapDumpProvider.java b/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/internal/HeapDumpProvider.java
index b86f57b..b885484 100644
--- a/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/internal/HeapDumpProvider.java
+++ b/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/core/internal/HeapDumpProvider.java
@@ -19,6 +19,8 @@ package org.apache.karaf.diagnostic.core.internal;
import com.sun.management.HotSpotDiagnosticMXBean;
import org.apache.karaf.diagnostic.core.DumpDestination;
import org.apache.karaf.diagnostic.core.DumpProvider;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.management.MBeanServer;
import java.io.File;
@@ -31,7 +33,8 @@ import java.lang.management.ManagementFactory;
*/
public class HeapDumpProvider implements DumpProvider {
- @Override
+ private final static Logger LOGGER = LoggerFactory.getLogger(HeapDumpProvider.class);
+
public void createDump(DumpDestination destination) throws Exception {
FileInputStream in = null;
OutputStream out = null;
@@ -53,7 +56,7 @@ public class HeapDumpProvider implements DumpProvider {
heapDumpFile.delete();
}
} catch (Exception e) {
- // nothing to do
+ LOGGER.warn("Can't create heapdump", e);
} finally {
if (in != null) {
in.close();
[2/2] git commit: [KARAF-3114] Fix whitelist configadmin issue in the
KarafMBeanServerGuard which prevented to use
ManagementFactory.getPlatformMBeanServer() code
Posted by jb...@apache.org.
[KARAF-3114] Fix whitelist configadmin issue in the KarafMBeanServerGuard which prevented to use ManagementFactory.getPlatformMBeanServer() code
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/a2881fe1
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/a2881fe1
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/a2881fe1
Branch: refs/heads/karaf-3.0.x
Commit: a2881fe114f64ea11085521683fa2587c88727b1
Parents: cd4732b
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Sat Aug 23 08:22:00 2014 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Sat Aug 23 08:22:00 2014 +0200
----------------------------------------------------------------------
.../apache/karaf/management/KarafMBeanServerGuard.java | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/a2881fe1/management/server/src/main/java/org/apache/karaf/management/KarafMBeanServerGuard.java
----------------------------------------------------------------------
diff --git a/management/server/src/main/java/org/apache/karaf/management/KarafMBeanServerGuard.java b/management/server/src/main/java/org/apache/karaf/management/KarafMBeanServerGuard.java
index 198c665..f129025 100644
--- a/management/server/src/main/java/org/apache/karaf/management/KarafMBeanServerGuard.java
+++ b/management/server/src/main/java/org/apache/karaf/management/KarafMBeanServerGuard.java
@@ -233,11 +233,14 @@ public class KarafMBeanServerGuard implements InvocationHandler {
private boolean canBypassRBAC(ObjectName objectName) {
List<String> allBypassObjectName = new ArrayList<String>();
try {
- for (Configuration config : configAdmin.listConfigurations("(service.pid=" + JMX_ACL_WHITELIST + ")")) {
- Enumeration<String> keys = config.getProperties().keys();
- while (keys.hasMoreElements()) {
- String element = keys.nextElement();
- allBypassObjectName.add(element);
+ Configuration[] configs = configAdmin.listConfigurations("(service.pid=" + JMX_ACL_WHITELIST + ")");
+ if (configs != null) {
+ for (Configuration config : configs) {
+ Enumeration<String> keys = config.getProperties().keys();
+ while (keys.hasMoreElements()) {
+ String element = keys.nextElement();
+ allBypassObjectName.add(element);
+ }
}
}
} catch (InvalidSyntaxException ise) {