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 2016/06/20 19:27:21 UTC
karaf-cellar git commit: [KARAF-4538] Cellar bundle regex is way too
"global" in command and MBean
Repository: karaf-cellar
Updated Branches:
refs/heads/cellar-3.0.x e8aeca8cc -> e255bda10
[KARAF-4538] Cellar bundle regex is way too "global" in command and MBean
Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/e255bda1
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/e255bda1
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/e255bda1
Branch: refs/heads/cellar-3.0.x
Commit: e255bda10a562fb137a25d631670ef62a2296b8b
Parents: e8aeca8
Author: Jean-Baptiste Onofr� <jb...@apache.org>
Authored: Mon Jun 20 21:26:55 2016 +0200
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Mon Jun 20 21:26:55 2016 +0200
----------------------------------------------------------------------
.../cellar/bundle/management/internal/CellarBundleMBeanImpl.java | 4 ++--
.../apache/karaf/cellar/bundle/shell/BundleCommandSupport.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/e255bda1/bundle/src/main/java/org/apache/karaf/cellar/bundle/management/internal/CellarBundleMBeanImpl.java
----------------------------------------------------------------------
diff --git a/bundle/src/main/java/org/apache/karaf/cellar/bundle/management/internal/CellarBundleMBeanImpl.java b/bundle/src/main/java/org/apache/karaf/cellar/bundle/management/internal/CellarBundleMBeanImpl.java
index 44cdacf..00efc57 100644
--- a/bundle/src/main/java/org/apache/karaf/cellar/bundle/management/internal/CellarBundleMBeanImpl.java
+++ b/bundle/src/main/java/org/apache/karaf/cellar/bundle/management/internal/CellarBundleMBeanImpl.java
@@ -516,14 +516,14 @@ public class CellarBundleMBeanImpl extends StandardMBean implements CellarBundle
bundles.add(bundle);
} else {
// no match on bundle name, fall back to symbolic name and check if it matches the regex
- matcher = namePattern.matcher(name);
+ matcher = namePattern.matcher(bundleSplit[0]);
if (matcher.find()) {
bundles.add(bundle);
}
}
} else {
// no bundle name, fall back to symbolic name and check if it matches the regex
- matcher = namePattern.matcher(name);
+ matcher = namePattern.matcher(bundleSplit[0]);
if (matcher.find()) {
bundles.add(bundle);
}
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/e255bda1/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/BundleCommandSupport.java
----------------------------------------------------------------------
diff --git a/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/BundleCommandSupport.java b/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/BundleCommandSupport.java
index 39f6464..64c9337 100644
--- a/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/BundleCommandSupport.java
+++ b/bundle/src/main/java/org/apache/karaf/cellar/bundle/shell/BundleCommandSupport.java
@@ -112,14 +112,14 @@ public abstract class BundleCommandSupport extends CellarCommandSupport {
bundles.add(bundle);
} else {
// no match on bundle name, fall back to symbolic name and check if it matches the regex
- matcher = namePattern.matcher(name);
+ matcher = namePattern.matcher(bundleSplit[0]);
if (matcher.find()) {
bundles.add(bundle);
}
}
} else {
// no bundle name, fall back to symbolic name and check if it matches the regex
- matcher = namePattern.matcher(name);
+ matcher = namePattern.matcher(bundleSplit[0]);
if (matcher.find()) {
bundles.add(bundle);
}