Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2007-06-08 15:22:48 -0400
committerThomas Watson2007-06-08 15:22:48 -0400
commit8068c3d18c8ace6ab61ea1a2a052104ad5fb1369 (patch)
treeec38e09c206d601a5373070d95113ba6151e170f
parente4fd47ba1c1b82bb859a121e1502fa83bb065431 (diff)
downloadrt.equinox.framework-R3_1_2_bug191652.tar.gz
rt.equinox.framework-R3_1_2_bug191652.tar.xz
rt.equinox.framework-R3_1_2_bug191652.zip
Bug 191652 Native code is not updated during bundle updateR3_1_2_bug191652
-rw-r--r--bundles/org.eclipse.osgi/META-INF/MANIFEST.MF112
-rw-r--r--bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/AbstractBundle.java2
2 files changed, 57 insertions, 57 deletions
diff --git a/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF
index 0059865a6..3019686fd 100644
--- a/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.osgi/META-INF/MANIFEST.MF
@@ -1,56 +1,56 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Export-Package: org.osgi.framework; version=1.3,
- org.osgi.service.packageadmin; version=1.2,
- org.osgi.service.permissionadmin; version=1.2,
- org.osgi.service.condpermadmin; version=1.0,
- org.osgi.service.url; version=1.0,
- org.osgi.service.startlevel; version=1.0,
- org.osgi.util.tracker; version=1.3,
- org.eclipse.osgi.event,
- org.eclipse.osgi.framework.console,
- org.eclipse.osgi.framework.eventmgr,
- org.eclipse.osgi.framework.log,
- org.eclipse.osgi.service.debug,
- org.eclipse.osgi.service.datalocation,
- org.eclipse.osgi.service.environment,
- org.eclipse.osgi.service.localization,
- org.eclipse.osgi.service.pluginconversion,
- org.eclipse.osgi.service.resolver,
- org.eclipse.osgi.service.runnable,
- org.eclipse.osgi.service.urlconversion,
- org.eclipse.osgi.util,
- org.eclipse.core.runtime.adaptor; x-friends:=org.eclipse.core.runtime,
- org.eclipse.core.runtime.internal.adaptor; x-internal:=true,
- org.eclipse.core.runtime.internal.stats; x-friends:="org.eclipse.core.runtime, org.eclipse.core.tools",
- org.eclipse.osgi.framework.adaptor; x-internal:=true,
- org.eclipse.osgi.framework.adaptor.core; x-internal:=true,
- org.eclipse.osgi.framework.debug; x-internal:=true,
- org.eclipse.osgi.framework.internal.core; x-internal:=true,
- org.eclipse.osgi.framework.internal.defaultadaptor; x-internal:=true,
- org.eclipse.osgi.framework.internal.protocol; x-internal:=true,
- org.eclipse.osgi.framework.internal.protocol.bundleentry; x-internal:=true,
- org.eclipse.osgi.framework.internal.protocol.bundleresource; x-internal:=true,
- org.eclipse.osgi.framework.internal.protocol.reference; x-internal:=true,
- org.eclipse.osgi.framework.internal.reliablefile; x-internal:=true,
- org.eclipse.osgi.framework.launcher; x-internal:=true,
- org.eclipse.osgi.framework.util; x-internal:=true,
- org.eclipse.osgi.internal.module; x-internal:=true,
- org.eclipse.osgi.internal.resolver; x-internal:=true,
- org.eclipse.osgi.internal.profile; x-internal:=true
-Export-Service: org.osgi.service.packageadmin.PackageAdmin,
- org.osgi.service.permissionadmin.PermissionAdmin,
- org.osgi.service.startlevel.StartLevel,
- org.eclipse.osgi.service.debug.DebugOptions
-Bundle-Name: %systemBundle
-Bundle-SymbolicName: org.eclipse.osgi; singleton:=true
-Bundle-Activator: org.eclipse.osgi.framework.internal.core.SystemBundleActivator
-Bundle-Description: %systemBundle
-Bundle-Copyright: %copyright
-Bundle-Vendor: %eclipse.org
-Bundle-Version: 3.1.2
-Bundle-Localization: systembundle
-Bundle-DocUrl: http://www.eclipse.org
-Eclipse-ExtensibleAPI: true
-Eclipse-SystemBundle: true
-Main-Class: org.eclipse.core.runtime.adaptor.EclipseStarter
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Export-Package: org.osgi.framework; version=1.3,
+ org.osgi.service.packageadmin; version=1.2,
+ org.osgi.service.permissionadmin; version=1.2,
+ org.osgi.service.condpermadmin; version=1.0,
+ org.osgi.service.url; version=1.0,
+ org.osgi.service.startlevel; version=1.0,
+ org.osgi.util.tracker; version=1.3,
+ org.eclipse.osgi.event,
+ org.eclipse.osgi.framework.console,
+ org.eclipse.osgi.framework.eventmgr,
+ org.eclipse.osgi.framework.log,
+ org.eclipse.osgi.service.debug,
+ org.eclipse.osgi.service.datalocation,
+ org.eclipse.osgi.service.environment,
+ org.eclipse.osgi.service.localization,
+ org.eclipse.osgi.service.pluginconversion,
+ org.eclipse.osgi.service.resolver,
+ org.eclipse.osgi.service.runnable,
+ org.eclipse.osgi.service.urlconversion,
+ org.eclipse.osgi.util,
+ org.eclipse.core.runtime.adaptor; x-friends:=org.eclipse.core.runtime,
+ org.eclipse.core.runtime.internal.adaptor; x-internal:=true,
+ org.eclipse.core.runtime.internal.stats; x-friends:="org.eclipse.core.runtime, org.eclipse.core.tools",
+ org.eclipse.osgi.framework.adaptor; x-internal:=true,
+ org.eclipse.osgi.framework.adaptor.core; x-internal:=true,
+ org.eclipse.osgi.framework.debug; x-internal:=true,
+ org.eclipse.osgi.framework.internal.core; x-internal:=true,
+ org.eclipse.osgi.framework.internal.defaultadaptor; x-internal:=true,
+ org.eclipse.osgi.framework.internal.protocol; x-internal:=true,
+ org.eclipse.osgi.framework.internal.protocol.bundleentry; x-internal:=true,
+ org.eclipse.osgi.framework.internal.protocol.bundleresource; x-internal:=true,
+ org.eclipse.osgi.framework.internal.protocol.reference; x-internal:=true,
+ org.eclipse.osgi.framework.internal.reliablefile; x-internal:=true,
+ org.eclipse.osgi.framework.launcher; x-internal:=true,
+ org.eclipse.osgi.framework.util; x-internal:=true,
+ org.eclipse.osgi.internal.module; x-internal:=true,
+ org.eclipse.osgi.internal.resolver; x-internal:=true,
+ org.eclipse.osgi.internal.profile; x-internal:=true
+Export-Service: org.osgi.service.packageadmin.PackageAdmin,
+ org.osgi.service.permissionadmin.PermissionAdmin,
+ org.osgi.service.startlevel.StartLevel,
+ org.eclipse.osgi.service.debug.DebugOptions
+Bundle-Name: %systemBundle
+Bundle-SymbolicName: org.eclipse.osgi; singleton:=true
+Bundle-Activator: org.eclipse.osgi.framework.internal.core.SystemBundleActivator
+Bundle-Description: %systemBundle
+Bundle-Copyright: %copyright
+Bundle-Vendor: %eclipse.org
+Bundle-Version: 3.1.2.v20070608r312fix191652
+Bundle-Localization: systembundle
+Bundle-DocUrl: http://www.eclipse.org
+Eclipse-ExtensibleAPI: true
+Eclipse-SystemBundle: true
+Main-Class: org.eclipse.core.runtime.adaptor.EclipseStarter
diff --git a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/AbstractBundle.java b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/AbstractBundle.java
index 08858fe8b..1c58d22c1 100644
--- a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/AbstractBundle.java
+++ b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/AbstractBundle.java
@@ -700,7 +700,7 @@ public abstract class AbstractBundle implements Bundle, Comparable, KeyedElement
final AbstractBundle newBundle = framework.createAndVerifyBundle(newBundleData);
String[] nativepaths = framework.selectNativeCode(newBundle);
if (nativepaths != null) {
- bundledata.installNativeCode(nativepaths);
+ newBundleData.installNativeCode(nativepaths);
}
boolean exporting;
int st = getState();

Back to the top