From: David ‘Bombe’ Roden Date: Mon, 4 Aug 2014 09:10:54 +0000 (+0200) Subject: Remove unnecessary method. X-Git-Tag: 0.9-rc1^2~3^2~166 X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=ec3c258bb44850c61a7c137b1746f7a8432a3c6c;p=Sone.git Remove unnecessary method. --- diff --git a/src/main/java/net/pterodactylus/sone/core/WebOfTrustUpdater.java b/src/main/java/net/pterodactylus/sone/core/WebOfTrustUpdater.java index 64d97ad..67bf3ac 100644 --- a/src/main/java/net/pterodactylus/sone/core/WebOfTrustUpdater.java +++ b/src/main/java/net/pterodactylus/sone/core/WebOfTrustUpdater.java @@ -113,25 +113,6 @@ public class WebOfTrustUpdater extends AbstractService { * otherwise */ public boolean addContextWait(OwnIdentity ownIdentity, String context) { - return addContextWait(ownIdentity, context, true); - } - - /** - * Adds the given context to the given own identity, waiting for completion of - * the operation. - * - * @param ownIdentity - * The own identity to add the context to - * @param context - * The context to add - * @param wait - * {@code true} to wait for the end of the operation, {@code false} to return - * immediately - * @return {@code true} if the context was added successfully, {@code false} if - * the context was not added successfully, or if the job should not - * wait for completion - */ - private boolean addContextWait(OwnIdentity ownIdentity, String context, boolean wait) { AddContextJob addContextJob = new AddContextJob(ownIdentity, context); if (!updateJobs.contains(addContextJob)) { logger.log(Level.FINER, "Adding Context Job: " + addContextJob); @@ -140,10 +121,8 @@ public class WebOfTrustUpdater extends AbstractService { } catch (InterruptedException ie1) { /* the queue is unbounded so it should never block. */ } - if (wait) { - return addContextJob.waitForCompletion(); - } - } else if (wait) { + return addContextJob.waitForCompletion(); + } else { for (WebOfTrustUpdateJob updateJob : updateJobs) { if (updateJob.equals(addContextJob)) { return updateJob.waitForCompletion();