You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2014/03/24 10:56:02 UTC
[1/2] git commit: [KARAF-2849] MBeanServer unregistration is not
correctly handled
Repository: karaf
Updated Branches:
refs/heads/karaf-3.0.x 16613dfab -> be1e36465
[KARAF-2849] MBeanServer unregistration is not correctly handled
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/89eb1b7e
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/89eb1b7e
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/89eb1b7e
Branch: refs/heads/karaf-3.0.x
Commit: 89eb1b7ea2d1b8a4f985146174d6d51fda6ebba0
Parents: 16613df
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Mon Mar 24 10:40:09 2014 +0100
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Mon Mar 24 10:54:02 2014 +0100
----------------------------------------------------------------------
.../management/boot/KarafMBeanServerBuilder.java | 14 ++++++++++++++
1 file changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/89eb1b7e/management/boot/src/main/java/org/apache/karaf/management/boot/KarafMBeanServerBuilder.java
----------------------------------------------------------------------
diff --git a/management/boot/src/main/java/org/apache/karaf/management/boot/KarafMBeanServerBuilder.java b/management/boot/src/main/java/org/apache/karaf/management/boot/KarafMBeanServerBuilder.java
index ad84235..9c5e014 100644
--- a/management/boot/src/main/java/org/apache/karaf/management/boot/KarafMBeanServerBuilder.java
+++ b/management/boot/src/main/java/org/apache/karaf/management/boot/KarafMBeanServerBuilder.java
@@ -62,6 +62,20 @@ public class KarafMBeanServerBuilder extends MBeanServerBuilder {
}
guard.invoke(proxy, method, args);
}
+ if (method.getName().equals("equals")
+ && method.getParameterTypes().length == 1
+ && method.getParameterTypes()[0] == Object.class) {
+ Object target = args[0];
+ if (target != null && Proxy.isProxyClass(target.getClass())) {
+ InvocationHandler handler = Proxy.getInvocationHandler(target);
+ if (handler instanceof MBeanInvocationHandler) {
+ args[0] = ((MBeanInvocationHandler) handler).wrapped;
+ }
+ }
+ } else if (method.getName().equals("finalize") && method.getParameterTypes().length == 0) {
+ // special case finalize, don't route through to delegate because that will get its own call
+ return null;
+ }
try {
return method.invoke(wrapped, args);
} catch (InvocationTargetException ite) {
[2/2] git commit: [KARAF-2850] The karaf-maven-plugin and boot
features service should be more resilient with the bootFeatures list.
Posted by gn...@apache.org.
[KARAF-2850] The karaf-maven-plugin and boot features service should be more resilient with the bootFeatures list.
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/be1e3646
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/be1e3646
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/be1e3646
Branch: refs/heads/karaf-3.0.x
Commit: be1e364655e30f1d844265f344915c3229a1175f
Parents: 89eb1b7
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Mon Mar 24 10:45:24 2014 +0100
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Mon Mar 24 10:54:09 2014 +0100
----------------------------------------------------------------------
.../apache/karaf/features/internal/BootFeaturesInstaller.java | 7 ++++++-
.../org/apache/karaf/tooling/features/InstallKarsMojo.java | 3 ++-
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/be1e3646/features/core/src/main/java/org/apache/karaf/features/internal/BootFeaturesInstaller.java
----------------------------------------------------------------------
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/BootFeaturesInstaller.java b/features/core/src/main/java/org/apache/karaf/features/internal/BootFeaturesInstaller.java
index 8fed435..b0d0673 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/BootFeaturesInstaller.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/BootFeaturesInstaller.java
@@ -152,7 +152,12 @@ public class BootFeaturesInstaller {
}
private Set<String> parseFeatureList(String group) {
- HashSet<String> features = new HashSet<String>(Arrays.asList(group.trim().split("\\s*,\\s*")));
+ HashSet<String> features = new HashSet<String>();
+ for (String feature : Arrays.asList(group.trim().split("\\s*,\\s*"))) {
+ if (feature.length() > 0) {
+ features.add(feature);
+ }
+ }
return features;
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/be1e3646/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java
index a67c767..f86abc0 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java
@@ -423,7 +423,8 @@ public class InstallKarsMojo extends MojoSupport {
}
private String retrieveProperty(Properties properties, String key) {
- return properties.containsKey(key) && properties.get(key) != null ? properties.get(key) + "," : "";
+ String val = properties.getProperty(key);
+ return val != null && val.length() > 0 ? val + "," : "";
}
private Features readFeatures(URI uri) throws MojoExecutionException, XMLStreamException, JAXBException, IOException {