From 163ae5f8195efbfe51a80f7843be8baa8c982d2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torbj=C3=B6rn=20Svensson?= Date: Thu, 19 Nov 2020 19:47:02 +0100 Subject: [PATCH] Bug 568228: Use lambda and for-each loop MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I296247de2dd0b05c0df38621f73dc05798f6c7cc Signed-off-by: Torbjörn Svensson --- .../eclipse/cdt/dsf/service/DsfServicesTracker.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/service/DsfServicesTracker.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/service/DsfServicesTracker.java index 823f683011c..76971be8888 100644 --- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/service/DsfServicesTracker.java +++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/service/DsfServicesTracker.java @@ -258,12 +258,7 @@ public class DsfServicesTracker { if (session != null) { try { if (!session.getExecutor().isInExecutorThread()) { - session.getExecutor().execute(new DsfRunnable() { - @Override - public void run() { - doDispose(); - } - }); + session.getExecutor().execute(this::doDispose); return; } } catch (RejectedExecutionException e) { @@ -280,8 +275,8 @@ public class DsfServicesTracker { private void doDispose() { try { fBundleContext.removeServiceListener(fListener); - for (Iterator> itr = fServices.keySet().iterator(); itr.hasNext();) { - fBundleContext.ungetService(itr.next()); + for (ServiceReference serviceRef : fServices.keySet()) { + fBundleContext.ungetService(serviceRef); } } catch (IllegalStateException e) { // May be thrown during shutdown (bug 293049).