Merge branch '2.0-master' into 2.0-dev

hai-service/src/main/java/com/hai/common/utils/HttpsUtils.java

@@ -105,6 +105,7 @@ public class    HttpsUtils {
 		apiUrl += param;
 		String result = null;
 		HttpClient httpClient = null;
+		HttpResponse response = null;
 		try {
 			
 			if (apiUrl.startsWith("https")) {
@@ -115,7 +116,7 @@ public class    HttpsUtils {
 			}
 		
 			HttpGet httpGet = new HttpGet(apiUrl);
-			HttpResponse response = httpClient.execute(httpGet);
+			response = httpClient.execute(httpGet);
 			HttpEntity entity = response.getEntity();
 			if (entity != null) {
 				InputStream instream = entity.getContent();
@@ -126,6 +127,13 @@ public class    HttpsUtils {
 		} catch (Exception e) {
 			log.error(e.getMessage(),e);
 		} finally {
+			if (response != null) {
+				try {
+					EntityUtils.consume(response.getEntity());
+				} catch (IOException e) {
+					log.error(e.getMessage(),e);
+				}
+			}
 		}
 		return null;
 	}