[storm] branch 1.x-branch updated: [STORM-2483] misnamed parameters

[et...@apache.org]

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

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


The following commit(s) were added to refs/heads/1.x-branch by this push:
     new e7b1c09  [STORM-2483] misnamed parameters
     new 514dd9a  Merge pull request #3230 from nd368/1.x-branch
e7b1c09 is described below

commit e7b1c09cf317738755c97bd41d820d94176b550d
Author: nathanday123 <na...@hotmail.co.uk>
AuthorDate: Wed Mar 18 10:04:21 2020 +0000

    [STORM-2483] misnamed parameters
---
 storm-core/src/jvm/org/apache/storm/utils/Utils.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/storm-core/src/jvm/org/apache/storm/utils/Utils.java b/storm-core/src/jvm/org/apache/storm/utils/Utils.java
index c5b6f39..a31d179 100644
--- a/storm-core/src/jvm/org/apache/storm/utils/Utils.java
+++ b/storm-core/src/jvm/org/apache/storm/utils/Utils.java
@@ -1558,11 +1558,11 @@ public class Utils {
         return number & Integer.MAX_VALUE;
     }
 
-    public static GlobalStreamId getGlobalStreamId(String streamId, String componentId) {
-        if (componentId == null) {
-            return new GlobalStreamId(streamId, DEFAULT_STREAM_ID);
+    public static GlobalStreamId getGlobalStreamId(String componentId, String streamId) {
+        if (streamId == null) {
+            return new GlobalStreamId(componentId, DEFAULT_STREAM_ID);
         }
-        return new GlobalStreamId(streamId, componentId);
+        return new GlobalStreamId(componentId, streamId);
     }
 
     public static RuntimeException wrapInRuntime(Exception e){