Skip to content

Commit 12f4338

Browse files
committed
Fixing poor return code flow path and adding test to verify proper return of start task operation.
1 parent 36381c0 commit 12f4338

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

devicedefender/source/DeviceDefender.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ namespace Aws
103103

104104
int ReportTask::StartTask() noexcept
105105
{
106+
int return_code = AWS_OP_ERR;
106107
if (m_taskConfig != nullptr && !m_lastError &&
107108
(this->GetStatus() == ReportTaskStatus::Ready || this->GetStatus() == ReportTaskStatus::Stopped))
108109
{
@@ -114,14 +115,14 @@ namespace Aws
114115
{
115116
this->m_lastError = aws_last_error();
116117
aws_raise_error(this->m_lastError);
117-
return AWS_OP_ERR;
118118
}
119119
else
120120
{
121121
this->m_status = ReportTaskStatus::Running;
122+
return_code = AWS_OP_SUCCESS;
122123
}
123124
}
124-
return AWS_OP_ERR;
125+
return return_code;
125126
}
126127

127128
void ReportTask::StopTask() noexcept

devicedefender/tests/DeviceDefenderTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ static int s_TestDeviceDefenderResourceSafety(Aws::Crt::Allocator *allocator, vo
6565

6666
ASSERT_INT_EQUALS((int)Aws::Iotdevicedefenderv1::ReportTaskStatus::Ready, (int)task.GetStatus());
6767

68-
task.StartTask();
68+
ASSERT_SUCCESS(task.StartTask());
6969
ASSERT_INT_EQUALS((int)Aws::Iotdevicedefenderv1::ReportTaskStatus::Running, (int)task.GetStatus());
7070
task.StopTask();
7171

0 commit comments

Comments
 (0)