svn commit: r1789097 - /jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java

[pmouawad]

Author: pmouawad
Date: Tue Mar 28 11:30:13 2017
New Revision: 1789097

URL: http://svn.apache.org/viewvc?rev=1789097&view=rev
Log:
Fix code smell

Modified:
    
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java

Modified: 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java?rev=1789097&r1=1789096&r2=1789097&view=diff
==============================================================================
--- 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
 (original)
+++ 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
 Tue Mar 28 11:30:13 2017
@@ -350,7 +350,7 @@ public class HTTPHC4Impl extends HTTPHCA
 
         HTTPSampleResult res = createSampleResult(url, method);
 
-        CloseableHttpClient httpClient = setupClient(url, res);
+        CloseableHttpClient httpClient = setupClient(url);
 
         HttpRequestBase httpRequest = null;
         try {
@@ -611,7 +611,7 @@ public class HTTPHC4Impl extends HTTPHCA
     /**
      * Execute request either as is or under PrivilegedAction 
      * if a Subject is available for url
-     * @param httpClient the {@link HttpClient} to be used to execute the 
httpRequest
+     * @param httpClient the {@link CloseableHttpClient} to be used to execute 
the httpRequest
      * @param httpRequest the {@link HttpRequest} to be executed
      * @param localContext th {@link HttpContext} to be used for execution
      * @param url the target url (will be used to look up a possible subject 
for the execution)
@@ -627,8 +627,8 @@ public class HTTPHC4Impl extends HTTPHCA
             Subject subject = authManager.getSubjectForUrl(url);
             if (subject != null) {
                 try {
-                    return (CloseableHttpResponse) Subject.doAs(subject,
-                            (PrivilegedExceptionAction<HttpResponse>) () ->
+                    return Subject.doAs(subject,
+                            (PrivilegedExceptionAction<CloseableHttpResponse>) 
() ->
                                     httpClient.execute(httpRequest, 
localContext));
                 } catch (PrivilegedActionException e) {
                     log.error("Can't execute httpRequest with subject: {}", 
subject, e);
@@ -754,7 +754,7 @@ public class HTTPHC4Impl extends HTTPHCA
         }
     }
 
-    private CloseableHttpClient setupClient(URL url, SampleResult res) {
+    private CloseableHttpClient setupClient(URL url) {
 
         Map<HttpClientKey, CloseableHttpClient> mapHttpClientPerHttpClientKey 
= HTTPCLIENTS_CACHE_PER_THREAD_AND_HTTPCLIENTKEY.get();