You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by et...@apache.org on 2020/03/19 14:04:38 UTC

[storm] branch master updated: [STORM-2483] misnamed parameters

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

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


The following commit(s) were added to refs/heads/master by this push:
     new b37a67a  [STORM-2483] misnamed parameters
     new 4d5e9b8  Merge pull request #3229 from nd368/STORM-2483
b37a67a is described below

commit b37a67ad75f27428e334900c8001169bda70f274
Author: nathanday123 <na...@hotmail.co.uk>
AuthorDate: Mon Mar 16 18:59:05 2020 +0000

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

diff --git a/storm-client/src/jvm/org/apache/storm/utils/Utils.java b/storm-client/src/jvm/org/apache/storm/utils/Utils.java
index afb72c4..f90a606 100644
--- a/storm-client/src/jvm/org/apache/storm/utils/Utils.java
+++ b/storm-client/src/jvm/org/apache/storm/utils/Utils.java
@@ -934,11 +934,11 @@ public class Utils {
         return rtn;
     }
 
-    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 Object getSetComponentObject(ComponentObject obj) {