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

Fix use of deprecated Strings2.toString(InputSupplier)

This commit is contained in:
Aled Sage 2014-07-17 17:00:20 +01:00
parent 779551c40f
commit 9536338f61
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apis/docker/src/main/java/org/jclouds/docker/handlers/DockerErrorHandler.java
View File

@ -16,8 +16,10 @@
*/ */
package org.jclouds.docker.handlers; package org.jclouds.docker.handlers;
import com.google.common.base.Throwables; import java.io.IOException;
import com.google.common.io.Closeables;
import javax.annotation.Resource;
import org.jclouds.http.HttpCommand; import org.jclouds.http.HttpCommand;
import org.jclouds.http.HttpErrorHandler; import org.jclouds.http.HttpErrorHandler;
import org.jclouds.http.HttpResponse; import org.jclouds.http.HttpResponse;
@ -27,8 +29,8 @@ import org.jclouds.rest.AuthorizationException;
import org.jclouds.rest.ResourceNotFoundException; import org.jclouds.rest.ResourceNotFoundException;
import org.jclouds.util.Strings2; import org.jclouds.util.Strings2;
import javax.annotation.Resource; import com.google.common.base.Throwables;
import java.io.IOException; import com.google.common.io.Closeables;
/** /**
* This will parse and set an appropriate exception on the command object. * This will parse and set an appropriate exception on the command object.
@ -92,15 +94,9 @@ public class DockerErrorHandler implements HttpErrorHandler {
if (response.getPayload() == null) if (response.getPayload() == null)
return null; return null;
try { try {
return Strings2.toString(response.getPayload()); return Strings2.toStringAndClose(response.getPayload().openStream());
} catch (IOException e) { } catch (IOException e) {
throw Throwables.propagate(e); throw Throwables.propagate(e);
} finally {
try {
response.getPayload().close();
} catch (IOException e) {
throw Throwables.propagate(e);
}
} }
} }
} }