felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickh...@apache.org
Subject svn commit: r1181180 - /felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java
Date Mon, 10 Oct 2011 19:56:03 GMT
Author: rickhall
Date: Mon Oct 10 19:56:02 2011
New Revision: 1181180

URL: http://svn.apache.org/viewvc?rev=1181180&view=rev
Log:
Framework was refreshing bundles incorrectly by stopping a bundle then
refreshing it in one step when it should really be stopping all bundles
in one step then refreshing all bundles in a second step. (FELIX-3153)

Modified:
    felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java

Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java?rev=1181180&r1=1181179&r2=1181180&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java Mon Oct 10 19:56:02
2011
@@ -3935,17 +3935,25 @@ public class Felix extends BundleImpl im
                         helpers.add(new RefreshHelper(b));
                     }
 
-                    // Stop, purge or remove, and reinitialize all bundles first.
+                    // Stop all refreshing bundles.
                     for (RefreshHelper helper : helpers)
                     {
                         if (helper != null)
                         {
                             helper.stop();
+                        }
+                    }
+
+                    // Refresh or remove all refreshing bundles first.
+                    for (RefreshHelper helper : helpers)
+                    {
+                        if (helper != null)
+                        {
                             helper.refreshOrRemove();
                         }
                     }
 
-                    // Then restart all bundles that were previously running.
+                    // Restart all refreshed bundles that were previously running.
                     for (RefreshHelper helper : helpers)
                     {
                         if (helper != null)



Mime
View raw message