Skip to content

Commit 480aee1

Browse files
committed
checking 200 with error message responses
1 parent 5ded3e0 commit 480aee1

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

generated/src/aws-cpp-sdk-s3-crt/source/S3CrtClient.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -687,9 +687,9 @@ void S3CrtClient::S3CrtRequestFinishCallback(struct aws_s3_meta_request* meta_re
687687

688688
Aws::Client::XmlOutcome S3CrtClient::GenerateXmlOutcome(const std::shared_ptr<HttpResponse>& response) const {
689689
Aws::Client::HttpResponseOutcome httpOutcome;
690-
if (AWSClient::DoesResponseGenerateError(response)) {
690+
auto error = GetErrorMarshaller()->Marshall(*response);
691+
if (error.GetErrorType() != Aws::Client::CoreErrors::UNKNOWN) {
691692
AWS_LOGSTREAM_DEBUG(ALLOCATION_TAG, "Request returned error. Attempting to generate appropriate error codes from response");
692-
auto error = BuildAWSError(response);
693693
httpOutcome = HttpResponseOutcome(std::move(error));
694694
} else {
695695
httpOutcome = HttpResponseOutcome(std::move(response));

tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/s3/s3-crt/S3CrtSpecificOperations.vm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,10 +209,10 @@ void S3CrtClient::S3CrtRequestFinishCallback(struct aws_s3_meta_request *meta_re
209209
Aws::Client::XmlOutcome S3CrtClient::GenerateXmlOutcome(const std::shared_ptr<HttpResponse>& response) const
210210
{
211211
Aws::Client::HttpResponseOutcome httpOutcome;
212-
if (AWSClient::DoesResponseGenerateError(response))
212+
auto error = GetErrorMarshaller()->Marshall(*response);
213+
if (error.GetErrorType() != Aws::Client::CoreErrors::UNKNOWN)
213214
{
214215
AWS_LOGSTREAM_DEBUG(ALLOCATION_TAG, "Request returned error. Attempting to generate appropriate error codes from response");
215-
auto error = BuildAWSError(response);
216216
httpOutcome = HttpResponseOutcome(std::move(error));
217217
}
218218
else

tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/s3/s3-crt/SmithyS3CrtSpecificOperations.vm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,10 +209,10 @@ void S3CrtClient::S3CrtRequestFinishCallback(struct aws_s3_meta_request *meta_re
209209
Aws::Client::XmlOutcome S3CrtClient::GenerateXmlOutcome(const std::shared_ptr<HttpResponse>& response) const
210210
{
211211
Aws::Client::HttpResponseOutcome httpOutcome;
212-
if (smithy::client::Utils::DoesResponseGenerateError(response))
212+
auto error = GetErrorMarshaller()->Marshall(*response);
213+
if (error.GetErrorType() != Aws::Client::CoreErrors::UNKNOWN)
213214
{
214215
AWS_LOGSTREAM_DEBUG(ALLOCATION_TAG, "Request returned error. Attempting to generate appropriate error codes from response");
215-
auto error = GetErrorMarshaller()->BuildAWSError(response);
216216
httpOutcome = HttpResponseOutcome(std::move(error));
217217
}
218218
else

0 commit comments

Comments
 (0)