natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-2.0' into cassandra-2.1

This commit is contained in:
Dave Brosius 2014-05-04 00:09:17 -04:00
parent f486193ab5 4233ee43d0
commit a79ad681ff
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/java/org/apache/cassandra/locator/CloudstackSnitch.java
View File

@ -17,9 +17,8 @@
*/
package org.apache.cassandra.locator;
import java.io.InputStream;
import java.io.DataInputStream;
import java.io.BufferedInputStream;
import java.io.FilterInputStream;
import java.io.BufferedReader;
import java.io.FileReader;
import java.io.IOException;
@ -112,7 +111,7 @@ public class CloudstackSnitch extends AbstractNetworkTopologySnitch
String csQueryMetadata(String url) throws ConfigurationException, IOException
{
HttpURLConnection conn = null;
BufferedInputStream is = null;
DataInputStream is = null;
try {
conn = (HttpURLConnection) new URL(url).openConnection();
@ -127,8 +126,8 @@ public class CloudstackSnitch extends AbstractNetworkTopologySnitch
int cl = conn.getContentLength();
byte[] b = new byte[cl];
is = new BufferedInputStream(conn.getInputStream());
is.read(b, 0, cl);
is = new DataInputStream(new BufferedInputStream(conn.getInputStream()));
is.readFully(b);
return new String(b, StandardCharsets.UTF_8);
} finally {
FileUtils.close(is);