root
/
jmeter
mirror of https://github.com/apache/jmeter.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Bug 63207 - java.lang.NullPointerException: null when run Jmeter 5.1 with proxy options 

Bugzilla Id: 63207

git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1854317 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: be3271fbce
This commit is contained in:
Philippe Mouawad 2019-02-25 15:47:07 +00:00
parent f6e5146c6b
commit b3d143263d
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/org/apache/jmeter/JMeter.java
View File

@ -760,11 +760,16 @@ public class JMeter implements JMeterPlugin {
System.setProperty("https.proxyHost", h);// $NON-NLS-1$
System.setProperty("http.proxyPort", p);// $NON-NLS-1$
System.setProperty("https.proxyPort", p);// $NON-NLS-1$
String proxyScheme = parser.getArgumentById(PROXY_SCHEME).getArgument();
if(!StringUtils.isBlank(proxyScheme)){
System.setProperty("http.proxyScheme", proxyScheme );// $NON-NLS-1$
String proxyScheme = null;
if (parser.getArgumentById(PROXY_SCHEME) != null) {
proxyScheme = parser.getArgumentById(PROXY_SCHEME).getArgument();
if(!StringUtils.isBlank(proxyScheme)){
System.setProperty("http.proxyScheme", proxyScheme );// $NON-NLS-1$
}
}
if(log.isInfoEnabled()) {
log.info("Set proxy Host: {}, Port: {}, Scheme: {}", h, p, proxyScheme != null ? proxyScheme : "Not set");
}
log.info("Set scheme: {} proxyHost: {} Port: {}", proxyScheme, h, p);
} else if (parser.getArgumentById(PROXY_HOST) != null || parser.getArgumentById(PROXY_PORT) != null) {
throw new IllegalUserActionException(JMeterUtils.getResString("proxy_cl_error"));// $NON-NLS-1$
}

1
xdocs/changes.xml
View File

@ -163,6 +163,7 @@ Summary
<h3>General</h3>
<ul>
<li><bug>63201</bug>SearchTreeDialog disappears behind master JFrame. Contributed by Benoit Vatan (benoit.vatan at gmail.com)</li>
<li><bug>63207</bug>java.lang.NullPointerException: null when run Jmeter 5.1 with proxy options</li>
</ul>
<!-- =================== Thanks =================== -->