Update RpcError stream handler callback to be invoked upon receiving an error

yourslab · yourslab · commit 658975813195 · 2021-07-01T19:35:43.000-07:00
diff --git a/eventstream_rpc/tests/EchoTestRpcModel.cpp b/eventstream_rpc/tests/EchoTestRpcModel.cpp
@@ -1066,7 +1066,7 @@ namespace Awstest
         RpcError rpcError)
     {
         bool streamShouldTerminate = false;
-        if (operationError == nullptr && rpcError.baseStatus != EVENT_STREAM_RPC_SUCCESS)
+        if (rpcError.baseStatus != EVENT_STREAM_RPC_SUCCESS)
         {
             streamShouldTerminate = OnStreamError(rpcError);
         }
@@ -1158,7 +1158,7 @@ namespace Awstest
         RpcError rpcError)
     {
         bool streamShouldTerminate = false;
-        if (operationError == nullptr && rpcError.baseStatus != EVENT_STREAM_RPC_SUCCESS)
+        if (rpcError.baseStatus != EVENT_STREAM_RPC_SUCCESS)
         {
             streamShouldTerminate = OnStreamError(rpcError);
         }
diff --git a/greengrass_ipc/source/GreengrassCoreIpcModel.cpp b/greengrass_ipc/source/GreengrassCoreIpcModel.cpp
@@ -4682,7 +4682,7 @@ namespace Aws
             RpcError rpcError)
         {
             bool streamShouldTerminate = false;
-            if (operationError == nullptr && rpcError.baseStatus != EVENT_STREAM_RPC_SUCCESS)
+            if (rpcError.baseStatus != EVENT_STREAM_RPC_SUCCESS)
             {
                 streamShouldTerminate = OnStreamError(rpcError);
             }
@@ -4851,7 +4851,7 @@ namespace Aws
             RpcError rpcError)
         {
             bool streamShouldTerminate = false;
-            if (operationError == nullptr && rpcError.baseStatus != EVENT_STREAM_RPC_SUCCESS)
+            if (rpcError.baseStatus != EVENT_STREAM_RPC_SUCCESS)
             {
                 streamShouldTerminate = OnStreamError(rpcError);
             }
@@ -5090,7 +5090,7 @@ namespace Aws
             RpcError rpcError)
         {
             bool streamShouldTerminate = false;
-            if (operationError == nullptr && rpcError.baseStatus != EVENT_STREAM_RPC_SUCCESS)
+            if (rpcError.baseStatus != EVENT_STREAM_RPC_SUCCESS)
             {
                 streamShouldTerminate = OnStreamError(rpcError);
             }
@@ -5256,7 +5256,7 @@ namespace Aws
             RpcError rpcError)
         {
             bool streamShouldTerminate = false;
-            if (operationError == nullptr && rpcError.baseStatus != EVENT_STREAM_RPC_SUCCESS)
+            if (rpcError.baseStatus != EVENT_STREAM_RPC_SUCCESS)
             {
                 streamShouldTerminate = OnStreamError(rpcError);
             }
@@ -6330,7 +6330,7 @@ namespace Aws
             RpcError rpcError)
         {
             bool streamShouldTerminate = false;
-            if (operationError == nullptr && rpcError.baseStatus != EVENT_STREAM_RPC_SUCCESS)
+            if (rpcError.baseStatus != EVENT_STREAM_RPC_SUCCESS)
             {
                 streamShouldTerminate = OnStreamError(rpcError);
             }

Original file line number	Diff line number	Diff line change
`@@ -1066,7 +1066,7 @@ namespace Awstest`
`1066`	`1066`	`RpcError rpcError)`
`1067`	`1067`	`{`
`1068`	`1068`	`bool streamShouldTerminate = false;`
`1069`		`- if (operationError == nullptr && rpcError.baseStatus != EVENT_STREAM_RPC_SUCCESS)`
	`1069`	`+ if (rpcError.baseStatus != EVENT_STREAM_RPC_SUCCESS)`
`1070`	`1070`	`{`
`1071`	`1071`	`streamShouldTerminate = OnStreamError(rpcError);`
`1072`	`1072`	`}`
`@@ -1158,7 +1158,7 @@ namespace Awstest`
`1158`	`1158`	`RpcError rpcError)`
`1159`	`1159`	`{`
`1160`	`1160`	`bool streamShouldTerminate = false;`
`1161`		`- if (operationError == nullptr && rpcError.baseStatus != EVENT_STREAM_RPC_SUCCESS)`
	`1161`	`+ if (rpcError.baseStatus != EVENT_STREAM_RPC_SUCCESS)`
`1162`	`1162`	`{`
`1163`	`1163`	`streamShouldTerminate = OnStreamError(rpcError);`
`1164`	`1164`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4682,7 +4682,7 @@ namespace Aws`
`4682`	`4682`	`RpcError rpcError)`
`4683`	`4683`	`{`
`4684`	`4684`	`bool streamShouldTerminate = false;`
`4685`		`- if (operationError == nullptr && rpcError.baseStatus != EVENT_STREAM_RPC_SUCCESS)`
	`4685`	`+ if (rpcError.baseStatus != EVENT_STREAM_RPC_SUCCESS)`
`4686`	`4686`	`{`
`4687`	`4687`	`streamShouldTerminate = OnStreamError(rpcError);`
`4688`	`4688`	`}`
`@@ -4851,7 +4851,7 @@ namespace Aws`
`4851`	`4851`	`RpcError rpcError)`
`4852`	`4852`	`{`
`4853`	`4853`	`bool streamShouldTerminate = false;`
`4854`		`- if (operationError == nullptr && rpcError.baseStatus != EVENT_STREAM_RPC_SUCCESS)`
	`4854`	`+ if (rpcError.baseStatus != EVENT_STREAM_RPC_SUCCESS)`
`4855`	`4855`	`{`
`4856`	`4856`	`streamShouldTerminate = OnStreamError(rpcError);`
`4857`	`4857`	`}`
`@@ -5090,7 +5090,7 @@ namespace Aws`
`5090`	`5090`	`RpcError rpcError)`
`5091`	`5091`	`{`
`5092`	`5092`	`bool streamShouldTerminate = false;`
`5093`		`- if (operationError == nullptr && rpcError.baseStatus != EVENT_STREAM_RPC_SUCCESS)`
	`5093`	`+ if (rpcError.baseStatus != EVENT_STREAM_RPC_SUCCESS)`
`5094`	`5094`	`{`
`5095`	`5095`	`streamShouldTerminate = OnStreamError(rpcError);`
`5096`	`5096`	`}`
`@@ -5256,7 +5256,7 @@ namespace Aws`
`5256`	`5256`	`RpcError rpcError)`
`5257`	`5257`	`{`
`5258`	`5258`	`bool streamShouldTerminate = false;`
`5259`		`- if (operationError == nullptr && rpcError.baseStatus != EVENT_STREAM_RPC_SUCCESS)`
	`5259`	`+ if (rpcError.baseStatus != EVENT_STREAM_RPC_SUCCESS)`
`5260`	`5260`	`{`
`5261`	`5261`	`streamShouldTerminate = OnStreamError(rpcError);`
`5262`	`5262`	`}`
`@@ -6330,7 +6330,7 @@ namespace Aws`
`6330`	`6330`	`RpcError rpcError)`
`6331`	`6331`	`{`
`6332`	`6332`	`bool streamShouldTerminate = false;`
`6333`		`- if (operationError == nullptr && rpcError.baseStatus != EVENT_STREAM_RPC_SUCCESS)`
	`6333`	`+ if (rpcError.baseStatus != EVENT_STREAM_RPC_SUCCESS)`
`6334`	`6334`	`{`
`6335`	`6335`	`streamShouldTerminate = OnStreamError(rpcError);`
`6336`	`6336`	`}`