From 6632465a3e69d810e75a13e41a6000a3bcd41234 Mon Sep 17 00:00:00 2001
From: Ian Bull
Date: Thu, 16 May 2013 12:53:47 -0700
Subject: Bug 406942 - BrandingIron#modifyInfoPListFile(..) should not remove
 icon

If the icon name is empty, we don't update the Info.plist file.---
 .../equinox/internal/p2/publisher/eclipse/BrandingIron.java  | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'bundles')

diff --git a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/BrandingIron.java b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/BrandingIron.java
index b2abf798e..3cf2fe1b6 100644
--- a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/BrandingIron.java
+++ b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/BrandingIron.java
@@ -540,11 +540,13 @@ public class BrandingIron {
 			replacePlistValue(buffer, BUNDLE_SHORT_VERSION_KEY, sv.toString());
 		}
 
-		int iconPos = scan(buffer, 0, ICON_NAME);
-		if (iconPos != -1)
-			buffer.replace(iconPos, iconPos + ICON_NAME.length(), iconName);
-		else {
-			replacePlistValue(buffer, ICON_KEY, iconName);
+		if (iconName.length() > 0) {
+			int iconPos = scan(buffer, 0, ICON_NAME);
+			if (iconPos != -1) {
+				buffer.replace(iconPos, iconPos + ICON_NAME.length(), iconName);
+			} else {
+				replacePlistValue(buffer, ICON_KEY, iconName);
+			}
 		}
 
 		File target = new File(targetRoot, "Info.plist"); //$NON-NLS-1$;
-- 
cgit v1.2.3