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

revised error handling on slicehost

This commit is contained in:
Adrian Cole 2011-01-24 07:32:02 -08:00
parent 5ba249ae46
commit 90bf1b3d07
2 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compute/src/test/java/org/jclouds/compute/BaseComputeServiceLiveTest.java
View File

@ -384,7 +384,7 @@ public abstract class BaseComputeServiceLiveTest {
assertLocationSameOrChild(metadata.getLocation(), template.getLocation());
checkImageIdMatchesTemplate(metadata);
checkOsMatchesTemplate(metadata);
assertEquals(metadata.getState(), NodeState.RUNNING);
assert (metadata.getState() == NodeState.RUNNING) : metadata;
// due to DHCP the addresses can actually change in-between runs.
assertEquals(metadata.getPrivateAddresses().size(), node.getPrivateAddresses().size());
assertEquals(metadata.getPublicAddresses().size(), node.getPublicAddresses().size());

27
providers/slicehost/src/main/java/org/jclouds/slicehost/handlers/ParseSlicehostErrorFromHttpResponse.java
View File

@ -32,12 +32,10 @@ import javax.inject.Singleton;
import org.jclouds.http.HttpCommand;
import org.jclouds.http.HttpErrorHandler;
import org.jclouds.http.HttpException;
import org.jclouds.http.HttpResponse;
import org.jclouds.http.HttpResponseException;
import org.jclouds.http.functions.ParseSax;
import org.jclouds.http.functions.ParseSax.Factory;
import org.jclouds.io.Payload;
import org.jclouds.logging.Logger;
import org.jclouds.rest.AuthorizationException;
import org.jclouds.rest.ResourceNotFoundException;
@ -111,15 +109,8 @@ public class ParseSlicehostErrorFromHttpResponse implements HttpErrorHandler {
this.errorHandlerProvider = errorHandlerProvider;
}
String parse(Payload in) {
try {
return factory.create(errorHandlerProvider.get()).parse(in.getInput());
} catch (HttpException e) {
logger.warn(e, "error parsing error");
return null;
} finally {
in.release();
}
String parse(String in) {
return factory.create(errorHandlerProvider.get()).parse(in);
}
}
@ -127,16 +118,10 @@ public class ParseSlicehostErrorFromHttpResponse implements HttpErrorHandler {
String parseErrorFromContentOrNull(HttpCommand command, HttpResponse response) {
// slicehost returns " " which is unparsable
if (response.getPayload() != null) {
String contentType = response.getPayload().getContentMetadata().getContentType();
if (response.getPayload().getContentMetadata().getContentLength() != 1) {
response.getPayload().release();
} else if (contentType != null && contentType.indexOf("xml") != -1) {
return errorParser.parse(response.getPayload());
} else {
try {
return Strings2.toStringAndClose(response.getPayload().getInput());
} catch (IOException e) {
}
try {
String payload = Strings2.toStringAndClose(response.getPayload().getInput()).trim();
return payload.indexOf("xml") != -1 ? errorParser.parse(payload) : payload;
} catch (IOException e) {
}
}
return null;