Attachment 178960 Details for Bug 272087 – patch for DS bundle released in equinox 3.4.2

[patch] patch for DS bundle released in equinox 3.4.2

patch_DS_272087_R3.4.2.txt (text/plain), 2.85 KB, created by Stoyan Boshev

on 2010-09-15 12:10:24 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Stoyan Boshev

Created: 2010-09-15 12:10:24 EDT

Size: 2.85 KB

patch

obsolete

>Index: src/org/eclipse/equinox/internal/ds/Activator.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/internal/ds/Activator.java,v
>retrieving revision 1.4
>diff -u -r1.4 Activator.java
>--- src/org/eclipse/equinox/internal/ds/Activator.java	15 Apr 2008 14:38:58 -0000	1.4
>+++ src/org/eclipse/equinox/internal/ds/Activator.java	15 Sep 2010 16:03:40 -0000
>@@ -153,7 +153,7 @@
> 		boolean hasHeaders = false;
> 		Bundle[] allBundles = bc.getBundles();
> 		for (int i = 0; i < allBundles.length; i++) {
>-			Dictionary allHeaders = allBundles[i].getHeaders();
>+			Dictionary allHeaders = allBundles[i].getHeaders("");
> 			if (allHeaders.get(ComponentConstants.SERVICE_COMPONENT) != null) {
> 				hasHeaders = true;
> 				break;
>@@ -219,7 +219,7 @@
> 
> 	public void bundleChanged(BundleEvent event) {
> 		if (event.getType() == BundleEvent.STARTING) {
>-			Dictionary allHeaders = event.getBundle().getHeaders();
>+			Dictionary allHeaders = event.getBundle().getHeaders("");
> 			if ((allHeaders.get(ComponentConstants.SERVICE_COMPONENT)) != null) {
> 				// The bundle is holding components - activate scr
> 				bc.removeBundleListener(this);
>Index: src/org/eclipse/equinox/internal/ds/SCRManager.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/internal/ds/SCRManager.java,v
>retrieving revision 1.5
>diff -u -r1.5 SCRManager.java
>--- src/org/eclipse/equinox/internal/ds/SCRManager.java	25 Apr 2008 08:02:49 -0000	1.5
>+++ src/org/eclipse/equinox/internal/ds/SCRManager.java	15 Sep 2010 16:03:40 -0000
>@@ -471,7 +471,7 @@
> 			}
> 		}
> 
>-		Dictionary allHeaders = bundle.getHeaders();
>+		Dictionary allHeaders = bundle.getHeaders("");
> 
> 		if (!((allHeaders.get(ComponentConstants.SERVICE_COMPONENT)) != null)) {
> 			// no component descriptions in this bundle
>Index: src/org/eclipse/equinox/internal/ds/storage/file/FileStorage.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/internal/ds/storage/file/FileStorage.java,v
>retrieving revision 1.3
>diff -u -r1.3 FileStorage.java
>--- src/org/eclipse/equinox/internal/ds/storage/file/FileStorage.java	4 Apr 2008 15:21:29 -0000	1.3
>+++ src/org/eclipse/equinox/internal/ds/storage/file/FileStorage.java	15 Sep 2010 16:03:40 -0000
>@@ -222,7 +222,7 @@
> 	}
> 
> 	private ManifestElement[] parseManifestHeader(Bundle bundle) {
>-		Dictionary headers = bundle.getHeaders();
>+		Dictionary headers = bundle.getHeaders("");
> 		String files = (String) headers.get(ComponentConstants.SERVICE_COMPONENT);
> 		if (files == null)
> 			return new ManifestElement[0];

Actions: View | Diff

Attachments on bug 272087: 131714 | 131715 | 131854 | 178960