felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickh...@apache.org
Subject svn commit: r809026 - /felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java
Date Fri, 28 Aug 2009 21:00:04 GMT
Author: rickhall
Date: Fri Aug 28 21:00:03 2009
New Revision: 809026

URL: http://svn.apache.org/viewvc?rev=809026&view=rev
Log:
Remove extension bundles from the installed list. (FELIX-1122)

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=809026&r1=809025&r2=809026&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 21:00:03
2009
@@ -2166,20 +2166,10 @@
 
         try
         {
-            // Extension Bundles are not removed until the framework is shutdown
-            if (bundle.isExtension())
-            {
-                bundle.setPersistentStateUninstalled();
-                bundle.setRemovalPending(true);
-                rememberUninstalledBundle(bundle);
-                setBundleStateAndNotify(bundle, Bundle.INSTALLED);
-                return;
-            }
-
             // The spec says that uninstall should always succeed, so
             // catch an exception here if stop() doesn't succeed and
             // rethrow it at the end.
-            if (bundle.getState() == Bundle.ACTIVE)
+            if (!bundle.isExtension() && (bundle.getState() == Bundle.ACTIVE))
             {
                 try
                 {



Mime
View raw message