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/09/30 11:01:56 UTC
git commit: [KARAF-3248] Fix bundle refresh when no bundle is provided
Repository: karaf
Updated Branches:
refs/heads/master d2654a5fe -> 0dcc21ec2
[KARAF-3248] Fix bundle refresh when no bundle is provided
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/0dcc21ec
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/0dcc21ec
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/0dcc21ec
Branch: refs/heads/master
Commit: 0dcc21ec24273500a432656443da1d8e233ef75a
Parents: d2654a5
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Tue Sep 30 10:16:59 2014 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Tue Sep 30 10:16:59 2014 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/karaf/bundle/command/Refresh.java | 5 ++++-
.../apache/karaf/bundle/core/internal/BundlesMBeanImpl.java | 6 +++++-
2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/0dcc21ec/bundle/core/src/main/java/org/apache/karaf/bundle/command/Refresh.java
----------------------------------------------------------------------
diff --git a/bundle/core/src/main/java/org/apache/karaf/bundle/command/Refresh.java b/bundle/core/src/main/java/org/apache/karaf/bundle/command/Refresh.java
index b9b31a6..664d87d 100644
--- a/bundle/core/src/main/java/org/apache/karaf/bundle/command/Refresh.java
+++ b/bundle/core/src/main/java/org/apache/karaf/bundle/command/Refresh.java
@@ -33,7 +33,10 @@ public class Refresh extends BundlesCommand {
protected Object doExecute(List<Bundle> bundles) throws Exception {
FrameworkWiring wiring = bundleContext.getBundle(0).adapt(FrameworkWiring.class);
- wiring.refreshBundles(bundles == null || bundles.isEmpty() ? null : bundles);
+ if (bundles == null || bundles.isEmpty()) {
+ bundles = null;
+ }
+ wiring.refreshBundles(bundles);
return null;
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/0dcc21ec/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/BundlesMBeanImpl.java
----------------------------------------------------------------------
diff --git a/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/BundlesMBeanImpl.java b/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/BundlesMBeanImpl.java
index 2a6dd01..dd5ef1c 100644
--- a/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/BundlesMBeanImpl.java
+++ b/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/BundlesMBeanImpl.java
@@ -130,7 +130,11 @@ public class BundlesMBeanImpl extends StandardMBean implements BundlesMBean {
public void refresh(String bundleId) throws MBeanException {
try {
List<Bundle> bundles = selectBundles(bundleId);
- getFrameworkWiring().refreshBundles(bundles);
+ if (bundles.isEmpty()) {
+ getFrameworkWiring().refreshBundles(null);
+ } else {
+ getFrameworkWiring().refreshBundles(bundles);
+ }
} catch (Exception e) {
throw new MBeanException(null, e.getMessage());
}