diff --git a/src/core/org/apache/jmeter/JMeter.java b/src/core/org/apache/jmeter/JMeter.java index ea86e6e262..cf693b8386 100644 --- a/src/core/org/apache/jmeter/JMeter.java +++ b/src/core/org/apache/jmeter/JMeter.java @@ -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$ } diff --git a/xdocs/changes.xml b/xdocs/changes.xml index 68716339aa..beffaa9651 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -163,6 +163,7 @@ Summary