Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuentin Le Menez2017-03-22 10:13:48 -0400
committerGerrit Code Review @ Eclipse.org2017-03-24 06:55:32 -0400
commit172c9b0b63ba3be2c93ff710a8b7b4d288db633e (patch)
tree6eb2a5d47555479616ed503c322554f1ef9d6c6b /plugins/infra/misc
parent28f1f7a11c28f8e416afdc7bac212f2275d0c85f (diff)
downloadorg.eclipse.papyrus-172c9b0b63ba3be2c93ff710a8b7b4d288db633e.tar.gz
org.eclipse.papyrus-172c9b0b63ba3be2c93ff710a8b7b4d288db633e.tar.xz
org.eclipse.papyrus-172c9b0b63ba3be2c93ff710a8b7b4d288db633e.zip
[releng] [oxygen] Update guava dependencies to 21.0.0
- Update target definitions to the latest orbit repository and set guava dependecy to 21.0.0 - Update MANIFEST.MF guava version references to 21.0.0 throughout the repository - regenerate the target platforms - update the sdk feature.xml to point on guava 21.0.0.v20170206-1425 from guava 15.0.0.v201403281430 - modified manifests and java classes to fit the new API - ameneded the tests on guava version targets in the manifests Change-Id: I7d15679cd28585f6ea517466e70bc0848dd3179d Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>
Diffstat (limited to 'plugins/infra/misc')
-rw-r--r--plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/internal/SyncService.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/internal/SyncService.java b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/internal/SyncService.java
index 1d461d6f1a1..c21dbe7ee86 100644
--- a/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/internal/SyncService.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/internal/SyncService.java
@@ -59,7 +59,7 @@ import com.google.common.util.concurrent.MoreExecutors;
*/
public class SyncService implements ISyncService {
- private static final ThreadLocal<SyncService> currentService = new ThreadLocal<SyncService>();
+ private static final ThreadLocal<SyncService> currentService = new ThreadLocal<>();
private ServicesRegistry services;
@@ -94,7 +94,7 @@ public class SyncService implements ISyncService {
public void startService() throws ServiceException {
editingDomain = ServiceUtils.getInstance().getTransactionalEditingDomain(services);
- setAsyncExecutor(TransactionHelper.createTransactionExecutor(editingDomain, MoreExecutors.sameThreadExecutor()));
+ setAsyncExecutor(TransactionHelper.createTransactionExecutor(editingDomain, MoreExecutors.directExecutor()));
policy = new SyncServiceOperation<ISyncPolicy>(this) {
@Override

Back to the top