Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBorislav Kapukaranov2011-05-17 05:18:23 -0400
committerBorislav Kapukaranov2011-05-17 05:18:23 -0400
commitfd637f9cfe0e0aa918e892c3b529bc5ded270277 (patch)
treef8171245e1d858496c44c2c5532ee1832959e0ea
parent1a4dd76abce9a5dd2b5ed0817e9b73a12c561cf6 (diff)
downloadorg.eclipse.virgo.kernel-fd637f9cfe0e0aa918e892c3b529bc5ded270277.tar.gz
org.eclipse.virgo.kernel-fd637f9cfe0e0aa918e892c3b529bc5ded270277.tar.xz
org.eclipse.virgo.kernel-fd637f9cfe0e0aa918e892c3b529bc5ded270277.zip
This includes the reserved work for system bundle 'system.bundle' in the exclusion when checking if a bundle is fragment on system bundle
-rw-r--r--org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/install/artifact/internal/bundle/StandardBundleInstallArtifact.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/install/artifact/internal/bundle/StandardBundleInstallArtifact.java b/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/install/artifact/internal/bundle/StandardBundleInstallArtifact.java
index 1a57c902..582a18e3 100644
--- a/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/install/artifact/internal/bundle/StandardBundleInstallArtifact.java
+++ b/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/install/artifact/internal/bundle/StandardBundleInstallArtifact.java
@@ -69,6 +69,8 @@ final class StandardBundleInstallArtifact extends AbstractInstallArtifact implem
private static final String EQUINOX_SYSTEM_BUNDLE_NAME = "org.eclipse.osgi";
+ private static final String RESERVED_SYSTEM_BUNDLE_NAME = "system.bundle";
+
private static final long REFRESH_RESTART_WAIT_PERIOD = 60;
private final Object monitor = new Object();
@@ -239,7 +241,7 @@ final class StandardBundleInstallArtifact extends AbstractInstallArtifact implem
private boolean isFragmentOnSystemBundle() {
String fragmentHost = this.bundleManifest.getFragmentHost().getBundleSymbolicName();
if (fragmentHost != null) {
- return fragmentHost.equals(EQUINOX_SYSTEM_BUNDLE_NAME);
+ return fragmentHost.equals(EQUINOX_SYSTEM_BUNDLE_NAME) || fragmentHost.equals(RESERVED_SYSTEM_BUNDLE_NAME);
}
return false;
}

Back to the top