From 67ef4e69fdcd894daba70600aae0f51328bf6c20 Mon Sep 17 00:00:00 2001
From: "koo.taejin" <koo.taejin@navercorp.com>
Date: Tue, 29 Nov 2016 17:33:19 +0900
Subject: [PATCH] [no issue] Fixed test case

Sometimes HttpClient3 stuck on execute releaseConnection method.
Set the so_timeout to ensure release connection .

"main" prio=10 tid=0x00007fb0e800d000 nid=0x1faa runnable [0x00007fb0ec4b1000]
   java.lang.Thread.State: RUNNABLE
        at java.net.SocketInputStream.socketRead0(Native Method)
        at java.net.SocketInputStream.read(SocketInputStream.java:129)
        at java.io.BufferedInputStream.fill(BufferedInputStream.java:218)
        at java.io.BufferedInputStream.read1(BufferedInputStream.java:258)
        at java.io.BufferedInputStream.read(BufferedInputStream.java:317)
        - locked <0x00000007ad42b490> (a java.io.BufferedInputStream)
        at org.apache.commons.httpclient.ChunkedInputStream.read(ChunkedInputStream.java:181)
        at org.apache.commons.httpclient.ChunkedInputStream.read(ChunkedInputStream.java:195)
        at org.apache.commons.httpclient.ChunkedInputStream.exhaustInputStream(ChunkedInputStream.java:368)
        at org.apache.commons.httpclient.ChunkedInputStream.close(ChunkedInputStream.java:345)
        at java.io.FilterInputStream.close(FilterInputStream.java:155)
        at org.apache.commons.httpclient.AutoCloseInputStream.notifyWatcher(AutoCloseInputStream.java:176)
        at org.apache.commons.httpclient.AutoCloseInputStream.close(AutoCloseInputStream.java:140)
        at org.apache.commons.httpclient.HttpMethodBase.releaseConnection(HttpMethodBase.java:1078)
        at com.navercorp.pinpoint.plugin.httpclient3.HttpClientIT.hostConfig(HttpClientIT.java:76)
---
 .../pinpoint/plugin/httpclient3/HttpClientIT.java          | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/agent/src/test/java/com/navercorp/pinpoint/plugin/httpclient3/HttpClientIT.java b/agent/src/test/java/com/navercorp/pinpoint/plugin/httpclient3/HttpClientIT.java
index 3abb72bf4..d3e1e44d7 100644
--- a/agent/src/test/java/com/navercorp/pinpoint/plugin/httpclient3/HttpClientIT.java
+++ b/agent/src/test/java/com/navercorp/pinpoint/plugin/httpclient3/HttpClientIT.java
@@ -36,12 +36,15 @@ import com.navercorp.pinpoint.test.plugin.PinpointPluginTestSuite;
 @Dependency({ "commons-httpclient:commons-httpclient:[3.0],[3.0.1],[3.1]" })
 public class HttpClientIT {
 
-    public static final long CONNECTION_TIMEOUT = 10000;
+    private static final long CONNECTION_TIMEOUT = 10000;
+    private static final int SO_TIMEOUT = 10000;
 
     @Test
     public void test() throws Exception {
         HttpClient client = new HttpClient();
         client.getParams().setConnectionManagerTimeout(CONNECTION_TIMEOUT);
+        client.getParams().setSoTimeout(SO_TIMEOUT);
+
         GetMethod method = new GetMethod("http://google.com");
 
         // Provide custom retry handler is necessary
@@ -64,6 +67,8 @@ public class HttpClientIT {
     public void hostConfig() throws Exception {
         HttpClient client = new HttpClient();
         client.getParams().setConnectionManagerTimeout(CONNECTION_TIMEOUT);
+        client.getParams().setSoTimeout(SO_TIMEOUT);
+
         HostConfiguration config = new HostConfiguration();
         config.setHost("weather.naver.com", 80, "http");
         GetMethod method = new GetMethod("/rgn/cityWetrMain.nhn");