Merge pull request #38 from awslabs/FB-XMLErrorParse

bretambrose · web-flow · commit 98ea1169e526 · 2016-11-02T21:47:28.000Z
No longer require message field in XML-based error parsing
diff --git a/aws-cpp-sdk-core/source/client/AWSClient.cpp b/aws-cpp-sdk-core/source/client/AWSClient.cpp
@@ -598,7 +598,7 @@ AWSError<CoreErrors> AWSXMLClient::BuildAWSError(const std::shared_ptr<Http::Htt
                 XmlNode codeNode = errorNode.FirstChild("Code");
                 XmlNode messageNode = errorNode.FirstChild("Message");
 
-                if (!(codeNode.IsNull() || messageNode.IsNull()))
+                if (!codeNode.IsNull())
                 {
                     error = GetErrorMarshaller()->Marshall(StringUtils::Trim(codeNode.GetText().c_str()),
                         StringUtils::Trim(messageNode.GetText().c_str()));

Original file line number	Diff line number	Diff line change
`@@ -598,7 +598,7 @@ AWSError<CoreErrors> AWSXMLClient::BuildAWSError(const std::shared_ptr<Http::Htt`
`598`	`598`	`XmlNode codeNode = errorNode.FirstChild("Code");`
`599`	`599`	`XmlNode messageNode = errorNode.FirstChild("Message");`
`600`	`600`
`601`		`- if (!(codeNode.IsNull() \|\| messageNode.IsNull()))`
	`601`	`+ if (!codeNode.IsNull())`
`602`	`602`	`{`
`603`	`603`	`error = GetErrorMarshaller()->Marshall(StringUtils::Trim(codeNode.GetText().c_str()),`
`604`	`604`	`StringUtils::Trim(messageNode.GetText().c_str()));`