commit 47ec5a2b7507072fc8770e0fed97af161bf39669
author Marc-Andre Laperle <marc-andre.laperle@ericsson.com> Thu Oct 17 17:48:01 2013 -0400
committer Curtis Windatt <cwindatt@ca.ibm.com> Mon Apr 07 12:21:10 2014 -0400
tree a43e67f4ee24b842476356f98b0089a110a4281a
parent 4bc5b8210c368001fc6bcd3cc63588d867d55075

Bug 419759 - NPE when exporting product containing a license feature

Do not try to replace license text with a null license text coming from
the license feature. Also, do not replace non-empty license URL with
empty URL. This makes it consistent with the Tycho behavior.

Change-Id: I8fc5023c21603eb814efeb3ba56d38e4d5179dbe
Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>

org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/LicenseReplaceTask.java

diff --git a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/LicenseReplaceTask.java b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/LicenseReplaceTask.java
index 32ea2f5..fa20f24 100644
--- a/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/LicenseReplaceTask.java
+++ b/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/LicenseReplaceTask.java
@@ -7,6 +7,7 @@
  * 
  *  Contributors:
  *     IBM - Initial API and implementation
+ *     Marc-Andre Laperle (Ericsson) - Fix NPE (Bug 419759)
  *******************************************************************************/
 package org.eclipse.pde.internal.build.tasks;
 
@@ -76,8 +77,10 @@
 
 			if (startLicenseText > 0 && endLicenseText > startLicenseText) {
 				// Replace license text
-				buffer.replace(startLicenseText, endLicenseText, licenseText);
-				contentChanged = true;
+				if (licenseText != null) {
+					buffer.replace(startLicenseText, endLicenseText, licenseText);
+					contentChanged = true;
+				}
 			} else if (insertionPoint > -1) {
 				//insert new license after <feature>
 				StringBuffer newLicense = new StringBuffer();
@@ -86,7 +89,8 @@
 				if (licenseURL != null)
 					newLicense.append(licenseURL);
 				newLicense.append(" >"); //$NON-NLS-1$
-				newLicense.append(licenseText);
+				if (licenseText != null)
+					newLicense.append(licenseText);
 				newLicense.append(LICENSE_END_TAG);
 
 				buffer.insert(insertionPoint, newLicense.toString());
@@ -109,7 +113,7 @@
 				// Replace non-empty payload URL
 				if (licenseURL == null) {
 					// with empty license URL
-					buffer.replace(startURLWord, endURLText + 1, ""); //$NON-NLS-1$
+					// No-op
 				} else {
 					// with non-empty license URL
 					buffer.replace(startURLText, endURLText + 1, licenseURL);