You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ff...@apache.org on 2013/01/14 07:08:14 UTC
svn commit: r1432809 - in /karaf/branches/karaf-2.3.x/features/core/src:
main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java
test/resources/org/apache/karaf/features/internal/repo2.xml
Author: ffang
Date: Mon Jan 14 06:08:14 2013
New Revision: 1432809
URL: http://svn.apache.org/viewvc?rev=1432809&view=rev
Log:
[KARAF-2108]a feature depend itself will cause stackoverflow error
Modified:
karaf/branches/karaf-2.3.x/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java
karaf/branches/karaf-2.3.x/features/core/src/test/resources/org/apache/karaf/features/internal/repo2.xml
Modified: karaf/branches/karaf-2.3.x/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java?rev=1432809&r1=1432808&r2=1432809&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java (original)
+++ karaf/branches/karaf-2.3.x/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java Mon Jan 14 06:08:14 2013
@@ -582,7 +582,10 @@ public class FeaturesServiceImpl impleme
if (state.features.containsKey(fi)) {
LOGGER.debug("Feature {} with version {} is already being installed", feature.getName(), feature.getVersion());
} else {
- doInstallFeature(state, fi, verbose);
+ if (! (fi.getName().equals(feature.getName())
+ && fi.getVersion().equals(feature.getVersion()))) {
+ doInstallFeature(state, fi, verbose);
+ }
}
}
for (String config : feature.getConfigurations().keySet()) {
Modified: karaf/branches/karaf-2.3.x/features/core/src/test/resources/org/apache/karaf/features/internal/repo2.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/features/core/src/test/resources/org/apache/karaf/features/internal/repo2.xml?rev=1432809&r1=1432808&r2=1432809&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/features/core/src/test/resources/org/apache/karaf/features/internal/repo2.xml (original)
+++ karaf/branches/karaf-2.3.x/features/core/src/test/resources/org/apache/karaf/features/internal/repo2.xml Mon Jan 14 06:08:14 2013
@@ -21,6 +21,7 @@
</feature>
<feature name="f1">
<feature>common</feature>
+ <feature>f1</feature>
<bundle>b2</bundle>
</feature>
<feature name="f2">