Skip to content
This repository was archived by the owner on Dec 18, 2022. It is now read-only.

Commit 14764a8

Browse files
committed
clean up code
1 parent 4b50f28 commit 14764a8

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

topl-service/src/main/java/io/matthewnelson/topl_service/service/components/actions/ServiceActionProcessor.kt

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -183,10 +183,10 @@ internal class ServiceActionProcessor(private val torService: BaseService): Serv
183183

184184
private fun clearActionQueue() {
185185
synchronized(actionQueueLock) {
186-
if (!actionQueue.isNullOrEmpty()) {
187-
actionQueue.clear()
188-
broadcastLogger.debug("Queue cleared")
189-
}
186+
if (actionQueue.isNullOrEmpty()) return
187+
188+
actionQueue.clear()
189+
broadcastLogger.debug("Queue cleared")
190190
}
191191
}
192192

@@ -206,20 +206,20 @@ internal class ServiceActionProcessor(private val torService: BaseService): Serv
206206

207207
private fun removeActionFromQueueByName(serviceActionNames: Array<@ServiceActionName String>) {
208208
synchronized(actionQueueLock) {
209-
if (!serviceActionNames.isNullOrEmpty() && !actionQueue.isNullOrEmpty()) {
210-
val queueIterator = actionQueue.iterator()
211-
while (queueIterator.hasNext()) {
212-
val next = queueIterator.next()
213-
var removed = false
214-
215-
serviceActionNames.forEach { serviceActionName ->
216-
if (!removed && next.name == serviceActionName) {
217-
queueIterator.remove()
218-
broadcastDebugMsgWithObjectDetails(
219-
"Removed from queue: ServiceAction.", next
220-
)
221-
removed = true
222-
}
209+
if (serviceActionNames.isNullOrEmpty() || actionQueue.isNullOrEmpty()) return
210+
211+
val queueIterator = actionQueue.iterator()
212+
while (queueIterator.hasNext()) {
213+
val next = queueIterator.next()
214+
var removed = false
215+
216+
serviceActionNames.forEach { serviceActionName ->
217+
if (!removed && next.name == serviceActionName) {
218+
queueIterator.remove()
219+
broadcastDebugMsgWithObjectDetails(
220+
"Removed from queue: ServiceAction.", next
221+
)
222+
removed = true
223223
}
224224
}
225225
}

0 commit comments

Comments
 (0)