Attachment 162104 Details for Bug 305429 – alternate patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] alternate patch

cme.patch (text/plain), 1.77 KB, created by Darin Wright

on 2010-03-15 16:31:08 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Darin Wright

Created: 2010-03-15 16:31:08 EDT

Size: 1.77 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.core
>Index: src/org/eclipse/pde/internal/core/bundle/BundleModel.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/bundle/BundleModel.java,v
>retrieving revision 1.22
>diff -u -r1.22 BundleModel.java
>--- src/org/eclipse/pde/internal/core/bundle/BundleModel.java	17 Feb 2010 20:13:42 -0000	1.22
>+++ src/org/eclipse/pde/internal/core/bundle/BundleModel.java	15 Mar 2010 20:29:55 -0000
>@@ -12,8 +12,8 @@
> 
> import java.io.IOException;
> import java.io.InputStream;
>-import java.util.*;
>-import java.util.Map.Entry;
>+import java.util.Map;
>+import java.util.Properties;
> import org.eclipse.osgi.service.resolver.BundleDescription;
> import org.eclipse.osgi.service.resolver.HostSpecification;
> import org.eclipse.osgi.util.ManifestElement;
>@@ -61,14 +61,16 @@
> 			// format headers
> 			BundleModelFactory factory = new BundleModelFactory(this);
> 			Map headers = fBundle.getHeaders();
>-			Iterator it = headers.entrySet().iterator();
>-			while (it.hasNext()) {
>-				Entry entry = (Entry) it.next();
>-				String key = (String) entry.getKey();
>-				String value = (String) entry.getValue();
>+			Object[] keys = headers.keySet().toArray();
>+			for (int i = 0; i < keys.length; i++) {
>+				String key = (String) keys[i];
>+				String value = (String) headers.get(key);
> 				IManifestHeader header = factory.createHeader(key, value);
> 				header.update();
>-				fBundle.setHeader(key, header.getValue());
>+				String formatted = header.getValue();
>+				if (formatted != null && formatted.trim().length() > 0) {
>+					fBundle.setHeader(key, formatted);
>+				}
> 			}
> 		} catch (BundleException e) {
> 		} catch (IOException e) {

Actions: View | Diff

Attachments on bug 305429: 161696 | 162104