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

Merge pull request #926 from andrewgaul/to-string-and-close-exception-handling 

Propagate exceptions from toStringAndClose
This commit is contained in:
Adrian Cole 2012-10-29 16:50:37 -07:00
parent 3a00a2c389 aad4d4dbcf
commit 3a2905ee1e
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/main/java/org/jclouds/util/Strings2.java
View File

@ -41,10 +41,6 @@ import java.util.concurrent.ExecutionException;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import javax.annotation.Resource;
import org.jclouds.logging.Logger;
import com.google.common.base.Charsets; import com.google.common.base.Charsets;
import com.google.common.io.CharStreams; import com.google.common.io.CharStreams;
import com.google.common.io.InputSupplier; import com.google.common.io.InputSupplier;
@ -135,11 +131,6 @@ public class Strings2 {
checkNotNull(input, "input"); checkNotNull(input, "input");
try { try {
return new String(toByteArray(input), Charsets.UTF_8); return new String(toByteArray(input), Charsets.UTF_8);
} catch (IOException e) {
logger.warn(e, "Failed to read from stream");
return null;
} catch (NullPointerException e) {
return null;
} finally { } finally {
closeQuietly(input); closeQuietly(input);
} }
@ -149,9 +140,6 @@ public class Strings2 {
return new ByteArrayInputStream(in.getBytes(Charsets.UTF_8)); return new ByteArrayInputStream(in.getBytes(Charsets.UTF_8));
} }
@Resource
private static Logger logger = Logger.NULL;
/** /**
* replaces tokens that are expressed as <code>{token}</code> * replaces tokens that are expressed as <code>{token}</code>
* *