Commit 37ec2e9c authored by agurov's avatar agurov

Deadlock is possible within RelocatedProjectHelper (bug 483402)

https://bugs.eclipse.org/bugs/show_bug.cgi?id=483402

git-svn-id: https://dev.eclipse.org/svnroot/technology/org.eclipse.subversive/trunk@21518 ee007c2a-0a25-0410-9ab9-bf268980928c
parent 30cfbda9
......@@ -77,12 +77,10 @@ public class RelocatedProjectHelper implements IResolutionHelper {
if (panel.getRecoveryAction() == RelocationChoicesPanel.RELOCATE_THE_PROJECT_BACK) {
RelocateWorkingCopyOperation mainOp = new RelocateWorkingCopyOperation(new IResource[] {project}, location);
CompositeOperation op = new CompositeOperation(mainOp.getId(), mainOp.getMessagesClass());
op.add(mainOp);
op.add(new RefreshResourcesOperation(mainOp));
ProgressMonitorUtility.doTaskExternal(mainOp, new NullProgressMonitor());
ProgressMonitorUtility.doTaskExternal(op, new NullProgressMonitor());
ProgressMonitorUtility.doTaskScheduled(new RefreshResourcesOperation(mainOp));
return mainOp.getExecutionState() == IActionOperation.OK;
}
......@@ -113,10 +111,11 @@ public class RelocatedProjectHelper implements IResolutionHelper {
}
}
});
op.add(new RefreshResourcesOperation(mainOp));
ProgressMonitorUtility.doTaskExternal(op, new NullProgressMonitor());
ProgressMonitorUtility.doTaskScheduled(new RefreshResourcesOperation(mainOp));
return true;
}
else if (panel.getRecoveryAction() == RelocationChoicesPanel.SHARE_WITH_ANOTHER_LOCATION) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment