Return null from getProvisioningJob when operation is not resolvedI20130724-1600

1 files changed, 4 insertions, 1 deletions

diff --git a/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/ProfileChangeOperation.java b/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/ProfileChangeOperation.java
index 0493de3b8..ec1923553 100644
--- a/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/ProfileChangeOperation.java
+++ b/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/ProfileChangeOperation.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2009, 2011 IBM Corporation and others.

+ * Copyright (c) 2009, 2013 IBM Corporation and others.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -317,6 +317,9 @@ public abstract class ProfileChangeOperation implements IProfileChangeJob {
 	 */

 	public ProvisioningJob getProvisioningJob(IProgressMonitor monitor) {

 		IStatus status = getResolutionResult();

+		//if status is null we haven't resolved yet, so we must return null here

+		if (status == null)

+			return null;

 		if (status.getSeverity() != IStatus.CANCEL && status.getSeverity() != IStatus.ERROR) {

 			if (job.getProvisioningPlan() != null) {

 				ProfileModificationJob pJob = new ProfileModificationJob(getProvisioningJobName(), session, profileId, job.getProvisioningPlan(), job.getActualProvisioningContext());