Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Arthorne2013-07-23 11:25:56 -0400
committerJohn Arthorne2013-07-23 11:25:56 -0400
commit6cfd0a2452f01a701596c9159f6b2dad0b663072 (patch)
tree9779d789e6e329ecb340c1dcb057b2f05fcec18b /bundles
parentcaaa43e955cc71edcf993a305395e569bf723aa2 (diff)
downloadrt.equinox.p2-6cfd0a2452f01a701596c9159f6b2dad0b663072.tar.gz
rt.equinox.p2-6cfd0a2452f01a701596c9159f6b2dad0b663072.tar.xz
rt.equinox.p2-6cfd0a2452f01a701596c9159f6b2dad0b663072.zip
Return null from getProvisioningJob when operation is not resolvedI20130724-1600
Diffstat (limited to 'bundles')
-rw-r--r--bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/ProfileChangeOperation.java5
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());

Back to the top