From 83534d49bee03a9d346a6cbce9a73a0a3b7e2b28 Mon Sep 17 00:00:00 2001
From: Graham Triggs <gtriggs@duraspace.org>
Date: Thu, 21 Jul 2016 21:00:09 +0100
Subject: [PATCH] Minor HttpClient resource cleanups

---
 .../mannlib/vitro/webapp/dao/jena/SparqlGraph.java       | 3 ++-
 .../webapp/rdfservice/impl/sparql/RDFServiceSparql.java  | 2 +-
 .../edu/ucsf/vitro/opensocial/OpenSocialSmokeTests.java  | 9 +++++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SparqlGraph.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SparqlGraph.java
index a03e461dd..1ef031594 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SparqlGraph.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SparqlGraph.java
@@ -45,6 +45,7 @@ import com.hp.hpl.jena.util.iterator.SingletonIterator;
 import com.hp.hpl.jena.util.iterator.WrappedIterator;
 
 import edu.cornell.mannlib.vitro.webapp.utils.logging.ToString;
+import org.apache.http.protocol.BasicHttpContext;
 import org.apache.http.util.EntityUtils;
 
 public class SparqlGraph implements GraphWithPerform {
@@ -97,7 +98,7 @@ public class SparqlGraph implements GraphWithPerform {
             meth.addHeader("Content-Type", "application/x-www-form-urlencoded");
             meth.setEntity(new UrlEncodedFormEntity(Arrays.asList(
                     new BasicNameValuePair("update", updateString))));
-            HttpResponse response = httpClient.execute(meth);
+            HttpResponse response = httpClient.execute(meth, new BasicHttpContext());
             try {
                 int statusCode = response.getStatusLine().getStatusCode();
                 if (statusCode > 399) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/sparql/RDFServiceSparql.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/sparql/RDFServiceSparql.java
index bfc7c0aec..d3ce2e941 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/sparql/RDFServiceSparql.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/sparql/RDFServiceSparql.java
@@ -932,7 +932,7 @@ public class RDFServiceSparql extends RDFServiceImpl implements RDFService {
 			}
 		}
 
-		return null;
+		return new BasicHttpContext();
 	}
 
 	protected UsernamePasswordCredentials getCredentials() {
diff --git a/api/src/main/java/edu/ucsf/vitro/opensocial/OpenSocialSmokeTests.java b/api/src/main/java/edu/ucsf/vitro/opensocial/OpenSocialSmokeTests.java
index ec0223a24..7e3d3cc9d 100644
--- a/api/src/main/java/edu/ucsf/vitro/opensocial/OpenSocialSmokeTests.java
+++ b/api/src/main/java/edu/ucsf/vitro/opensocial/OpenSocialSmokeTests.java
@@ -32,6 +32,7 @@ import org.apache.http.impl.client.DefaultHttpClient;
 import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
 import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
 import edu.cornell.mannlib.vitro.webapp.utils.threads.VitroBackgroundThread;
+import org.apache.http.util.EntityUtils;
 
 /**
  * Do some quick checks to see whether the OpenSocial stuff is configured and
@@ -384,8 +385,12 @@ public class OpenSocialSmokeTests implements ServletContextListener {
 			try {
 				log.debug("Trying to connect to Shindig");
 				HttpResponse response = httpClient.execute(method);
-				statusCode = response.getStatusLine().getStatusCode();
-				log.debug("HTTP status was " + statusCode);
+				try {
+					statusCode = response.getStatusLine().getStatusCode();
+					log.debug("HTTP status was " + statusCode);
+				} finally {
+					EntityUtils.consume(response.getEntity());
+				}
 			} catch (SocketTimeoutException e) {
 				// Catch the exception so we can retry this.
 				// Save the status so we know why we failed.