You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ri...@apache.org on 2009/08/28 18:04:01 UTC

svn commit: r808934 - /felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java

Author: rickhall
Date: Fri Aug 28 16:04:01 2009
New Revision: 808934

URL: http://svn.apache.org/viewvc?rev=808934&view=rev
Log:
Use system bundle update to restart framework is an extension bundle is
refreshed. (FELIX-33)

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=808934&r1=808933&r2=808934&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 Fri Aug 28 16:04:01 2009
@@ -27,7 +27,6 @@
 import org.apache.felix.framework.cache.*;
 import org.apache.felix.framework.ext.SecurityProvider;
 import org.apache.felix.framework.searchpolicy.*;
-import org.apache.felix.framework.ModuleImpl.ModuleClassLoader;
 import org.apache.felix.framework.ServiceRegistry.ServiceRegistryCallbacks;
 import org.apache.felix.framework.util.*;
 import org.apache.felix.framework.util.manifestparser.*;
@@ -3389,12 +3388,6 @@
                 }
             }
 
-            if (restart)
-            {
-// TODO: Extension Bundle - We need a way to restart the framework
-                m_logger.log(Logger.LOG_WARNING, "Framework restart not implemented.");
-            }
-
             // Remove any targeted bundles from the uninstalled bundles
             // array, since they will be removed from the system after
             // the refresh.
@@ -3438,6 +3431,18 @@
                     }
                 }
             }
+
+            if (restart)
+            {
+                try
+                {
+                    update();
+                }
+                catch (BundleException ex)
+                {
+                    m_logger.log(Logger.LOG_ERROR, "Framework restart error.", ex);
+                }
+            }
         }
         finally
         {