Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updated to accomodate application/unknown ec2 errors

This commit is contained in:
Adrian Cole 2010-09-14 23:51:03 -07:00
parent 0d7d2fe778
commit be69174a20
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
aws/core/src/main/java/org/jclouds/aws/handlers/ParseAWSErrorFromXmlContent.java
View File

@ -71,7 +71,8 @@ public class ParseAWSErrorFromXmlContent implements HttpErrorHandler {
AWSError error = null; AWSError error = null;
String message = null; String message = null;
if (response.getPayload().getContentType() != null if (response.getPayload().getContentType() != null
&& response.getPayload().getContentType().indexOf("xml") != -1) { && (response.getPayload().getContentType().indexOf("xml") != -1 || response.getPayload()
.getContentType().indexOf("unknown") != -1)) {
error = utils.parseAWSErrorFromContent(request, response); error = utils.parseAWSErrorFromContent(request, response);
if (error != null) { if (error != null) {
message = error.getMessage(); message = error.getMessage();

2
aws/core/src/test/java/org/jclouds/aws/handlers/ParseAWSErrorFromXmlContentTest.java
View File

@ -71,7 +71,7 @@ public class ParseAWSErrorFromXmlContentTest {
@Test @Test
public void test400WithInvalidGroupDuplicateIllegalStateException() { public void test400WithInvalidGroupDuplicateIllegalStateException() {
assertCodeMakes("GET", URI.create("https://amazonaws.com/foo"), 400, "", assertCodeMakes("GET", URI.create("https://amazonaws.com/foo"), 400,"Bad Request", "application/unknown",
"<Error><Code>InvalidGroup.Duplicate</Code></Error>", IllegalStateException.class); "<Error><Code>InvalidGroup.Duplicate</Code></Error>", IllegalStateException.class);
} }