Revision 9151
Added by rnahf over 9 years ago
src/edu/ucsb/nceas/metacat/replication/ReplicationService.java | ||
---|---|---|
60 | 60 |
import javax.servlet.http.HttpServletResponse; |
61 | 61 |
|
62 | 62 |
import org.apache.commons.io.IOUtils; |
63 |
import org.apache.http.HttpResponse; |
|
63 | 64 |
import org.apache.http.client.HttpClient; |
64 | 65 |
import org.apache.http.impl.client.HttpClientBuilder; |
65 | 66 |
import org.apache.http.impl.client.HttpClients; |
... | ... | |
2292 | 2293 |
logReplication.info("ReplicationService.getURLStream - Before sending request to: " + u.toString()); |
2293 | 2294 |
// use httpclient to set up SSL |
2294 | 2295 |
RestClient client = getSSLClient(); |
2295 |
// get the response content |
|
2296 |
InputStream input = client.doGetRequest(u.toString(), null); |
|
2296 |
HttpResponse response = client.doGetRequest(u.toString(),null); |
|
2297 |
// get the response content |
|
2298 |
InputStream input = response.getEntity().getContent(); |
|
2297 | 2299 |
logReplication.info("ReplicationService.getURLStream - After getting response from: " + u.toString()); |
2298 | 2300 |
|
2299 | 2301 |
return input; |
Also available in: Unified diff
fixed getSSLClient method.