You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2015/01/25 23:01:54 UTC
svn commit: r1654709 -
/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHCAbstractImpl.java
Author: pmouawad
Date: Sun Jan 25 22:01:54 2015
New Revision: 1654709
URL: http://svn.apache.org/r1654709
Log:
Add a warning about possible future deprecation
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHCAbstractImpl.java
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHCAbstractImpl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHCAbstractImpl.java?rev=1654709&r1=1654708&r2=1654709&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHCAbstractImpl.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHCAbstractImpl.java Sun Jan 25 22:01:54 2015
@@ -26,6 +26,7 @@ import java.util.List;
import java.util.Set;
import java.util.StringTokenizer;
+import org.apache.commons.lang3.StringUtils;
import org.apache.jmeter.JMeter;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.logging.LoggingManager;
@@ -76,12 +77,16 @@ public abstract class HTTPHCAbstractImpl
// -1 means not defined
protected static final int SO_TIMEOUT = JMeterUtils.getPropDefault("httpclient.timeout", -1);
-
+
// Control reuse of cached SSL Context in subsequent iterations
protected static final boolean USE_CACHED_SSL_CONTEXT =
JMeterUtils.getPropDefault("https.use.cached.ssl.context", true);//$NON-NLS-1$
static {
+ if(!StringUtils.isEmpty(JMeterUtils.getProperty("httpclient.timeout"))) { //$NON-NLS-1$
+ log.warn("You're using property 'httpclient.timeout' that will soon be deprecated for HttpClient3.1, you should either set "
+ + "timeout in HTTP Request GUI, HTTP Request Defaults or set http.socket.timeout in httpclient.parameters");
+ }
if (NONPROXY_HOSTS.length() > 0){
StringTokenizer s = new StringTokenizer(NONPROXY_HOSTS,"|");// $NON-NLS-1$
while (s.hasMoreTokens()){