karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject karaf-cellar git commit: Fix display of the installation flag in cluster:feature-list and MBean operation
Date Wed, 14 Jan 2015 17:02:54 GMT
Repository: karaf-cellar
Updated Branches:
  refs/heads/master e4fb165d0 -> ff474da16


Fix display of the installation flag in cluster:feature-list and MBean operation


Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/ff474da1
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/ff474da1
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/ff474da1

Branch: refs/heads/master
Commit: ff474da1622402f0f6f428212ef3518ac65eacf5
Parents: e4fb165
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Wed Jan 14 18:01:38 2015 +0100
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Wed Jan 14 18:01:38 2015 +0100

----------------------------------------------------------------------
 .../features/management/internal/CellarFeaturesMBeanImpl.java      | 2 ++
 .../apache/karaf/cellar/features/shell/ListFeaturesCommand.java    | 2 ++
 2 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/ff474da1/features/src/main/java/org/apache/karaf/cellar/features/management/internal/CellarFeaturesMBeanImpl.java
----------------------------------------------------------------------
diff --git a/features/src/main/java/org/apache/karaf/cellar/features/management/internal/CellarFeaturesMBeanImpl.java
b/features/src/main/java/org/apache/karaf/cellar/features/management/internal/CellarFeaturesMBeanImpl.java
index 6e354d3..1c56eeb 100644
--- a/features/src/main/java/org/apache/karaf/cellar/features/management/internal/CellarFeaturesMBeanImpl.java
+++ b/features/src/main/java/org/apache/karaf/cellar/features/management/internal/CellarFeaturesMBeanImpl.java
@@ -352,6 +352,8 @@ public class CellarFeaturesMBeanImpl extends StandardMBean implements
CellarFeat
             String key = feature.getName() + "/" + feature.getVersion();
             if (features.containsKey(key)) {
                 ExtendedFeatureState extendedState = features.get(key);
+                if (featuresService.isInstalled(feature))
+                    extendedState.setInstalled(true);
                 extendedState.setLocal(true);
             } else {
                 ExtendedFeatureState extendedState = new ExtendedFeatureState();

http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/ff474da1/features/src/main/java/org/apache/karaf/cellar/features/shell/ListFeaturesCommand.java
----------------------------------------------------------------------
diff --git a/features/src/main/java/org/apache/karaf/cellar/features/shell/ListFeaturesCommand.java
b/features/src/main/java/org/apache/karaf/cellar/features/shell/ListFeaturesCommand.java
index 170e1b7..073112f 100644
--- a/features/src/main/java/org/apache/karaf/cellar/features/shell/ListFeaturesCommand.java
+++ b/features/src/main/java/org/apache/karaf/cellar/features/shell/ListFeaturesCommand.java
@@ -159,6 +159,8 @@ public class ListFeaturesCommand extends CellarCommandSupport {
             String key = feature.getName() + "/" + feature.getVersion();
             if (features.containsKey(key)) {
                 ExtendedFeatureState extendedState = features.get(key);
+                if (featuresService.isInstalled(feature))
+                    extendedState.setInstalled(true);
                 extendedState.setLocal(true);
             } else {
                 ExtendedFeatureState extendedState = new ExtendedFeatureState();


Mime
View raw message