[storm] branch 2.2.x-branch updated: [STORM-3620] fix errors introduced by cherry-picking from master branch

[et...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ethanli pushed a commit to branch 2.2.x-branch
in repository https://gitbox.apache.org/repos/asf/storm.git


The following commit(s) were added to refs/heads/2.2.x-branch by this push:
     new 3fb9fe8  [STORM-3620] fix errors introduced by cherry-picking from master branch
     new 619b189  Merge pull request #3285 from Ethanlm/STORM-3620-fix-2.2.x
3fb9fe8 is described below

commit 3fb9fe8b67a08ae6fbe8470e67de8db6f5fcbaa5
Author: Ethan Li <et...@gmail.com>
AuthorDate: Tue Jun 9 22:28:01 2020 -0500

    [STORM-3620] fix errors introduced by cherry-picking from master branch
---
 .../org/apache/storm/executor/ExecutorTransferMultiThreadingTest.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/storm-client/test/jvm/org/apache/storm/executor/ExecutorTransferMultiThreadingTest.java b/storm-client/test/jvm/org/apache/storm/executor/ExecutorTransferMultiThreadingTest.java
index 5dcb128..6e8a5d2 100644
--- a/storm-client/test/jvm/org/apache/storm/executor/ExecutorTransferMultiThreadingTest.java
+++ b/storm-client/test/jvm/org/apache/storm/executor/ExecutorTransferMultiThreadingTest.java
@@ -96,7 +96,7 @@ public class ExecutorTransferMultiThreadingTest {
         //But there is already one worker transfer queue initialized by WorkerTransfer class (taskId=-1).
         //However the taskId is only used for metrics and it is not important here. Making it -100 to avoid collision.
         transferQueue = new JCQueue("worker-transfer-queue", 1024, 0, 1, new WaitStrategyPark(100),
-            workerState.getTopologyId(), Constants.SYSTEM_COMPONENT_ID, Collections.singletonList(-100), workerState.getPort(),
+            workerState.getTopologyId(), Constants.SYSTEM_COMPONENT_ID, -100, workerState.getPort(),
             workerState.getMetricRegistry());
 
         //Replace the transferQueue inside WorkerTransfer (inside WorkerState) with the customized transferQueue to be used in this test