jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1754995 - /jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java
Date Tue, 02 Aug 2016 19:16:46 GMT
Author: pmouawad
Date: Tue Aug  2 19:16:46 2016
New Revision: 1754995

URL: http://svn.apache.org/viewvc?rev=1754995&view=rev
Log:
Factor our code to remove findbugs warning

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

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java?rev=1754995&r1=1754994&r2=1754995&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java
(original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java
Tue Aug  2 19:16:46 2016
@@ -354,7 +354,8 @@ public class HTTPHC3Impl extends HTTPHCA
 
             log.debug("End : sample");
             return res;
-        } catch (IllegalArgumentException e) { // e.g. some kinds of invalid URL
+        } catch (IllegalArgumentException // e.g. some kinds of invalid URL
+                | IOException e) { 
             res.sampleEnd();
             // pick up headers if failed to execute the request
             // httpMethod can be null if method is unexpected
@@ -363,14 +364,6 @@ public class HTTPHC3Impl extends HTTPHCA
             }
             errorResult(e, res);
             return res;
-        } catch (IOException e) {
-            res.sampleEnd();
-            // pick up headers if failed to execute the request
-            // httpMethod cannot be null here, otherwise 
-            // it would have been caught in the previous catch block
-            res.setRequestHeaders(getConnectionHeaders(httpMethod));
-            errorResult(e, res);
-            return res;
         } finally {
             savedClient = null;
             if (httpMethod != null) {



Mime
View raw message