Author: jbonofre
Date: Mon Apr 23 13:17:47 2012
New Revision: 1329226
URL: http://svn.apache.org/viewvc?rev=1329226&view=rev
Log:
[KARAF-1387] Fix warning message on feature name (even when the name was
provided)
Modified:
karaf/branches/karaf-2.2.x/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java
karaf/branches/karaf-2.2.x/features/core/src/test/resources/org/apache/karaf/features/repo1.xml
Modified:
karaf/branches/karaf-2.2.x/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java?rev=1329226&r1=1329225&r2=1329226&view=diff
==============================================================================
---
karaf/branches/karaf-2.2.x/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java
(original)
+++
karaf/branches/karaf-2.2.x/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java
Mon Apr 23 13:17:47 2012
@@ -210,11 +210,11 @@ public class FeaturesServiceImpl impleme
validateRepository(uri);
RepositoryImpl repo = null;
repo = new RepositoryImpl(uri);
+ repositories.put(uri, repo);
+ repo.load();
if (repo.getName() == null) {
LOGGER.warn("Feature repository doesn't have a name. The name will
be mandatory in the next Karaf version.");
}
- repositories.put(uri, repo);
- repo.load();
callListeners(new RepositoryEvent(repo,
RepositoryEvent.EventType.RepositoryAdded, false));
features = null;
return repo;
Modified:
karaf/branches/karaf-2.2.x/features/core/src/test/resources/org/apache/karaf/features/repo1.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/features/core/src/test/resources/org/apache/karaf/features/repo1.xml?rev=1329226&r1=1329225&r2=1329226&view=diff
==============================================================================
---
karaf/branches/karaf-2.2.x/features/core/src/test/resources/org/apache/karaf/features/repo1.xml
(original)
+++
karaf/branches/karaf-2.2.x/features/core/src/test/resources/org/apache/karaf/features/repo1.xml
Mon Apr 23 13:17:47 2012
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<features>
+<features name="test">
<repository>urn:r1</repository>
<feature name="f1">
<config name="c1">
