jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1846867 - /jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
Date Sun, 18 Nov 2018 21:35:01 GMT
Author: pmouawad
Date: Sun Nov 18 21:35:01 2018
New Revision: 1846867

URL: http://svn.apache.org/viewvc?rev=1846867&view=rev
Log:
Bug 62829 - Allow specifying Proxy server scheme for HTTP request sampler, Advanced tab and
command line option

Fix Checkstyle errors
Bugzilla Id: 62829

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=1846867&r1=1846866&r2=1846867&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
Sun Nov 18 21:35:01 2018
@@ -903,11 +903,12 @@ public class HTTPHC4Impl extends HTTPHCA
             HttpClientKey other = (HttpClientKey) obj;
             if (this.hasProxy) { // otherwise proxy String fields may be null
                 if (proxyScheme == null) {
-                    if (other.proxyScheme != null)
+                    if (other.proxyScheme != null) {
                         return false;
-                } else if (!proxyScheme.equals(other.proxyScheme))
+                    }
+                } else if (!proxyScheme.equals(other.proxyScheme)) {
                     return false;
-                
+                }
                 return 
                 this.hasProxy == other.hasProxy &&
                 this.proxyPort == other.proxyPort &&



Mime
View raw message