Remove extension bundles from the installed list. (FELIX-1122)
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@809026 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/framework/src/main/java/org/apache/felix/framework/Felix.java b/framework/src/main/java/org/apache/felix/framework/Felix.java
index 7f79433..fd29299 100644
--- a/framework/src/main/java/org/apache/felix/framework/Felix.java
+++ b/framework/src/main/java/org/apache/felix/framework/Felix.java
@@ -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
{