svn commit: r743453 - in /servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features: internal/RepositoryImpl.java management/ManagedFeaturesRegistry.java

[ccustine]

Author: ccustine
Date: Wed Feb 11 19:03:04 2009
New Revision: 743453

URL: http://svn.apache.org/viewvc?rev=743453&view=rev
Log:
SMX4KNL-185 Features JMX view does not reload persistent state on restart
- Added one more little fix

Modified:
    
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/RepositoryImpl.java
    
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/management/ManagedFeaturesRegistry.java

Modified: 
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/RepositoryImpl.java
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/RepositoryImpl.java?rev=743453&r1=743452&r2=743453&view=diff
==============================================================================
--- 
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/RepositoryImpl.java
 (original)
+++ 
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/RepositoryImpl.java
 Wed Feb 11 19:03:04 2009
@@ -94,10 +94,12 @@
                 } else if ("feature".equals(node.getNodeName())) {
                     Element e = (Element) nodes.item(i);
                     String name = e.getAttribute("name");
-                    FeatureImpl f = new FeatureImpl(name);
                     String version = e.getAttribute("version");
+                    FeatureImpl f;
                     if (version != null && version.length() > 0) {
-                        f.setVersion(version);
+                        f = new FeatureImpl(name, version);
+                    } else {
+                        f = new FeatureImpl(name);
                     }
 
                     NodeList featureNodes = e.getElementsByTagName("feature");

Modified: 
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/management/ManagedFeaturesRegistry.java
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/management/ManagedFeaturesRegistry.java?rev=743453&r1=743452&r2=743453&view=diff
==============================================================================
--- 
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/management/ManagedFeaturesRegistry.java
 (original)
+++ 
servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/management/ManagedFeaturesRegistry.java
 Wed Feb 11 19:03:04 2009
@@ -194,6 +194,7 @@
         }
 
         for (ManagedFeature feature : installedFeatures.values()) {
+            installedFeatures.put(feature.getId(), feature);
             managementAgent.register(feature, 
namingStrategy.getObjectName(feature, true));
         }