Revert "[522199] Add job join after save to avoid concurrence issues"
This reverts commit 8cc9ce0fe1a08659f7313575d73f1ff20c79ba78.
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/session/DefaultLocalSessionCreationOperation.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/session/DefaultLocalSessionCreationOperation.java
index 7e176ab..6d267f4 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/session/DefaultLocalSessionCreationOperation.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/session/DefaultLocalSessionCreationOperation.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2017 THALES GLOBAL SERVICES.
+ * Copyright (c) 2009, 2015 THALES GLOBAL SERVICES.
* 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
@@ -13,14 +13,10 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.emf.common.util.URI;
import org.eclipse.sirius.business.api.session.factory.SessionFactory;
-import org.eclipse.sirius.business.internal.session.danalysis.SaveSessionJob;
import org.eclipse.sirius.viewpoint.Messages;
-import org.eclipse.sirius.viewpoint.SiriusPlugin;
/**
* A common operation to create a session and open it.
@@ -49,7 +45,8 @@
* @param sessionResourceURI
* the {@link URI} of the Resource {@link Session} model
* @param monitor
- * {@link IProgressMonitor} to show progression of {@link Session} creation
+ * {@link IProgressMonitor} to show progression of
+ * {@link Session} creation
*/
public DefaultLocalSessionCreationOperation(URI sessionResourceURI, IProgressMonitor monitor) {
this.sessionResourceURI = sessionResourceURI;
@@ -74,11 +71,6 @@
session.open(new SubProgressMonitor(monitor, 1));
monitor.subTask(Messages.DAnalysisSessionImpl_saveMsg);
session.save(new SubProgressMonitor(monitor, 1));
- try {
- Job.getJobManager().join(SaveSessionJob.FAMILY, new SubProgressMonitor(monitor, 1));
- } catch (OperationCanceledException | InterruptedException e) {
- SiriusPlugin.getDefault().error(Messages.AbstractSavingPolicy_savingErrorMsg, e);
- }
} finally {
monitor.done();
}
