You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2015/04/14 17:41:11 UTC
karaf git commit: [KARAF-2952] Add support for plain feature names
and error handling in feature:stop and start
Repository: karaf
Updated Branches:
refs/heads/master f8363dec5 -> 0397cac32
[KARAF-2952] Add support for plain feature names and error handling in feature:stop and start
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/0397cac3
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/0397cac3
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/0397cac3
Branch: refs/heads/master
Commit: 0397cac320c3dff540ee93cb37d6cc812c3cd4c1
Parents: f8363de
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Tue Apr 14 17:39:44 2015 +0200
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Tue Apr 14 17:40:51 2015 +0200
----------------------------------------------------------------------
.../apache/karaf/features/command/FeaturesCommandSupport.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/0397cac3/features/command/src/main/java/org/apache/karaf/features/command/FeaturesCommandSupport.java
----------------------------------------------------------------------
diff --git a/features/command/src/main/java/org/apache/karaf/features/command/FeaturesCommandSupport.java b/features/command/src/main/java/org/apache/karaf/features/command/FeaturesCommandSupport.java
index f015237..5f56289 100644
--- a/features/command/src/main/java/org/apache/karaf/features/command/FeaturesCommandSupport.java
+++ b/features/command/src/main/java/org/apache/karaf/features/command/FeaturesCommandSupport.java
@@ -51,7 +51,10 @@ public abstract class FeaturesCommandSupport implements Action {
}
protected String getFeatureId(FeaturesService admin, String featureName) throws Exception {
- Feature[] matchingFeatures = admin.getFeatures(featureName);
+ String[] parts = featureName.split("/");
+ String name = parts.length > 0 ? parts[0] : featureName;
+ String version = parts.length > 1 ? parts[1] : null;
+ Feature[] matchingFeatures = admin.getFeatures(name, version);
if (matchingFeatures.length == 0) {
throw new IllegalArgumentException("No matching feature found for " + featureName);
}