From 2378889657b99261fc2f105c81e832ab2450ba0b Mon Sep 17 00:00:00 2001 From: Evgeny Kolyakov Date: Sat, 1 Feb 2020 13:00:08 +0200 Subject: [PATCH] Allow different values for the same parameters --- .../throttleconcurrents/ThrottleQueueTaskDispatcher.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/hudson/plugins/throttleconcurrents/ThrottleQueueTaskDispatcher.java b/src/main/java/hudson/plugins/throttleconcurrents/ThrottleQueueTaskDispatcher.java index d74d0ea6..683a8473 100644 --- a/src/main/java/hudson/plugins/throttleconcurrents/ThrottleQueueTaskDispatcher.java +++ b/src/main/java/hudson/plugins/throttleconcurrents/ThrottleQueueTaskDispatcher.java @@ -333,6 +333,10 @@ private boolean isAnotherBuildWithSameParametersRunningOnNode(Node node, Queue.I itemParams = doFilterParams(paramsToCompare, itemParams); } + if (itemParams.size() == 0) { + return false; + } + if (computer != null) { for (Executor exec : computer.getExecutors()) { // TODO: refactor into a nameEquals helper method @@ -343,7 +347,7 @@ private boolean isAnotherBuildWithSameParametersRunningOnNode(Node node, Queue.I List executingUnitParams = getParametersFromWorkUnit(exec.getCurrentWorkUnit()); executingUnitParams = doFilterParams(paramsToCompare, executingUnitParams); - if (executingUnitParams.containsAll(itemParams)) { + if (executingUnitParams.size() > 0 && executingUnitParams.containsAll(itemParams)) { LOGGER.log(Level.FINE, "build (" + exec.getCurrentWorkUnit() + ") with identical parameters (" + executingUnitParams + ") is already running.");