Corrected error propagation.

DavidOgunsAWS · DavidOgunsAWS · commit 4c814f419ead · 2021-07-27T20:23:38.000Z
diff --git a/crt/aws-c-iot b/crt/aws-c-iot
@@ -1 +1 @@
-Subproject commit 71a73d145e7b4634a82918dba2f5352e6ec71229
+Subproject commit 4766720fd85dcf4600e552ffbfc6bba32ab4b983
diff --git a/devicedefender/source/DeviceDefender.cpp b/devicedefender/source/DeviceDefender.cpp
@@ -55,6 +55,10 @@ namespace Aws
                 aws_iotdevice_defender_config_set_task_period_ns(m_taskConfig,
                     aws_timestamp_convert(taskPeriodSeconds, AWS_TIMESTAMP_SECS, AWS_TIMESTAMP_NANOS, NULL));
             }
+            else
+            {
+                m_lastError = aws_last_error();
+            }
         }
 
         ReportTask::ReportTask(ReportTask &&toMove) noexcept
@@ -100,13 +104,11 @@ namespace Aws
 
         int ReportTask::StartTask() noexcept
         {
-          if (m_taskConfig != nullptr && (this->GetStatus() == ReportTaskStatus::Ready || this->GetStatus() == ReportTaskStatus::Stopped))
+            if (m_taskConfig != nullptr && !m_lastError && (this->GetStatus() == ReportTaskStatus::Ready || this->GetStatus() == ReportTaskStatus::Stopped))
             {
-              m_lastError = aws_iotdevice_defender_task_create(&m_owningTask, this->m_taskConfig,
+                if (AWS_OP_SUCCESS != aws_iotdevice_defender_task_create(&m_owningTask, this->m_taskConfig,
                                                                m_mqttConnection->GetUnderlyingConnection(),
-                                                               aws_event_loop_group_get_next_loop(m_eventLoopGroup.GetUnderlyingHandle()));
-
-                if (this->m_owningTask == nullptr)
+                                                                         aws_event_loop_group_get_next_loop(m_eventLoopGroup.GetUnderlyingHandle())))
                 {
                     this->m_lastError = aws_last_error();
                     aws_raise_error(this->m_lastError);

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,10 @@ namespace Aws`
`55`	`55`	`aws_iotdevice_defender_config_set_task_period_ns(m_taskConfig,`
`56`	`56`	`aws_timestamp_convert(taskPeriodSeconds, AWS_TIMESTAMP_SECS, AWS_TIMESTAMP_NANOS, NULL));`
`57`	`57`	`}`
	`58`	`+ else`
	`59`	`+ {`
	`60`	`+ m_lastError = aws_last_error();`
	`61`	`+ }`
`58`	`62`	`}`
`59`	`63`
`60`	`64`	`ReportTask::ReportTask(ReportTask &&toMove) noexcept`
`@@ -100,13 +104,11 @@ namespace Aws`
`100`	`104`
`101`	`105`	`int ReportTask::StartTask() noexcept`
`102`	`106`	`{`
`103`		`- if (m_taskConfig != nullptr && (this->GetStatus() == ReportTaskStatus::Ready \|\| this->GetStatus() == ReportTaskStatus::Stopped))`
	`107`	`+ if (m_taskConfig != nullptr && !m_lastError && (this->GetStatus() == ReportTaskStatus::Ready \|\| this->GetStatus() == ReportTaskStatus::Stopped))`
`104`	`108`	`{`
`105`		`- m_lastError = aws_iotdevice_defender_task_create(&m_owningTask, this->m_taskConfig,`
	`109`	`+ if (AWS_OP_SUCCESS != aws_iotdevice_defender_task_create(&m_owningTask, this->m_taskConfig,`
`106`	`110`	`m_mqttConnection->GetUnderlyingConnection(),`
`107`		`- aws_event_loop_group_get_next_loop(m_eventLoopGroup.GetUnderlyingHandle()));`
`108`		`-`
`109`		`- if (this->m_owningTask == nullptr)`
	`111`	`+ aws_event_loop_group_get_next_loop(m_eventLoopGroup.GetUnderlyingHandle())))`
`110`	`112`	`{`
`111`	`113`	`this->m_lastError = aws_last_error();`
`112`	`114`	`aws_raise_error(this->m_lastError);`