Author: pmouawad
Date: Sat Sep 17 21:57:50 2016
New Revision: 1761290
URL: http://svn.apache.org/viewvc?rev=1761290&view=rev
Log:
Updated httpcore to 4.4.5 from 4.4.4
Remove dependency on GuardedBy annotation
Modified:
jmeter/trunk/src/protocol/http/org/apache/http/impl/conn/JMeterPoolingClientConnectionManager.java
Modified:
jmeter/trunk/src/protocol/http/org/apache/http/impl/conn/JMeterPoolingClientConnectionManager.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/http/impl/conn/JMeterPoolingClientConnectionManager.java?rev=1761290&r1=1761289&r2=1761290&view=diff
==============================================================================
---
jmeter/trunk/src/protocol/http/org/apache/http/impl/conn/JMeterPoolingClientConnectionManager.java
(original)
+++
jmeter/trunk/src/protocol/http/org/apache/http/impl/conn/JMeterPoolingClientConnectionManager.java
Sat Sep 17 21:57:50 2016
@@ -34,7 +34,6 @@ import java.util.concurrent.TimeoutExcep
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.http.annotation.ThreadSafe;
import org.apache.http.conn.ClientConnectionManager;
import org.apache.http.conn.ClientConnectionOperator;
import org.apache.http.conn.ClientConnectionRequest;
@@ -53,10 +52,9 @@ import org.apache.http.util.Asserts;
* extracted from {@link PoolingHttpClientConnectionManager} to allow using
* better validation mechanism introduced in 4.4
* TODO : Remove when full upgrade to new HttpClient 4.5.X API is finished
- * @deprecated Will be removed in 3.1, DO NOT USE
+ * @deprecated Will be removed in 3.2, DO NOT USE
*/
@Deprecated
-@ThreadSafe
public class JMeterPoolingClientConnectionManager implements
ClientConnectionManager, ConnPoolControl<HttpRoute> {
private static final int VALIDATE_AFTER_INACTIVITY_DEFAULT = 2000;
