[httpcomponents-asyncclient] 06/06: Update httpcore-ThreadSafe.patch
Markus Koschany
apo at moszumanska.debian.org
Thu Jul 14 17:31:39 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository httpcomponents-asyncclient.
commit 9362a0bd18b16a12941caea1a947b29e95651e60
Author: Markus Koschany <apo at debian.org>
Date: Thu Jul 14 19:20:02 2016 +0200
Update httpcore-ThreadSafe.patch
---
debian/patches/httpcore-ThreadSafe.patch | 136 ++++++++++++++++++++++++++++++-
1 file changed, 135 insertions(+), 1 deletion(-)
diff --git a/debian/patches/httpcore-ThreadSafe.patch b/debian/patches/httpcore-ThreadSafe.patch
index 0f7b091..e2ea0ca 100644
--- a/debian/patches/httpcore-ThreadSafe.patch
+++ b/debian/patches/httpcore-ThreadSafe.patch
@@ -8,10 +8,16 @@ Forwarded: no
.../org/apache/http/impl/client/cache/CachingHttpAsyncClient.java | 5 +++--
.../org/apache/http/impl/nio/conn/AsyncSchemeRegistryFactory.java | 5 +++--
.../org/apache/http/impl/nio/client/CloseableHttpAsyncClient.java | 5 +++--
+ .../apache/http/impl/nio/client/CloseableHttpPipeliningClient.java | 5 +++--
+ .../apache/http/impl/nio/client/DefaultAsyncUserTokenHandler.java | 5 +++--
+ .../java/org/apache/http/impl/nio/client/HttpAsyncClientBuilder.java | 2 --
+ .../main/java/org/apache/http/impl/nio/client/HttpAsyncClients.java | 5 +++--
+ .../apache/http/impl/nio/client/MinimalHttpAsyncClientBuilder.java | 2 --
.../src/main/java/org/apache/http/impl/nio/conn/CPool.java | 5 +++--
.../src/main/java/org/apache/http/impl/nio/conn/CPoolEntry.java | 5 +++--
+ .../src/main/java/org/apache/http/impl/nio/conn/CPoolProxy.java | 2 --
.../http/impl/nio/conn/PoolingNHttpClientConnectionManager.java | 5 +++--
- 6 files changed, 18 insertions(+), 12 deletions(-)
+ 12 files changed, 27 insertions(+), 24 deletions(-)
diff --git a/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpAsyncClient.java b/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpAsyncClient.java
index 9f2e425..136b3ae 100644
@@ -80,6 +86,115 @@ index 33f7f5a..6409877 100644
public abstract class CloseableHttpAsyncClient implements HttpAsyncClient, Closeable {
public abstract boolean isRunning();
+diff --git a/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/CloseableHttpPipeliningClient.java b/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/CloseableHttpPipeliningClient.java
+index 71890de..d52b271 100644
+--- a/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/CloseableHttpPipeliningClient.java
++++ b/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/CloseableHttpPipeliningClient.java
+@@ -33,7 +33,8 @@ import java.util.concurrent.Future;
+ import org.apache.http.HttpHost;
+ import org.apache.http.HttpRequest;
+ import org.apache.http.HttpResponse;
+-import org.apache.http.annotation.ThreadSafe;
++import org.apache.http.annotation.ThreadingBehavior;
++import org.apache.http.annotation.Contract;
+ import org.apache.http.client.protocol.HttpClientContext;
+ import org.apache.http.concurrent.FutureCallback;
+ import org.apache.http.nio.client.HttpPipeliningClient;
+@@ -49,7 +50,7 @@ import org.apache.http.util.Args;
+ *
+ * @since 4.1
+ */
+- at ThreadSafe
++ at Contract(threading = ThreadingBehavior.SAFE)
+ public abstract class CloseableHttpPipeliningClient
+ extends CloseableHttpAsyncClient implements HttpPipeliningClient {
+
+diff --git a/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultAsyncUserTokenHandler.java b/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultAsyncUserTokenHandler.java
+index f599fdd..a493486 100644
+--- a/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultAsyncUserTokenHandler.java
++++ b/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultAsyncUserTokenHandler.java
+@@ -27,7 +27,8 @@
+ package org.apache.http.impl.nio.client;
+
+ import org.apache.http.HttpConnection;
+-import org.apache.http.annotation.Immutable;
++import org.apache.http.annotation.ThreadingBehavior;
++import org.apache.http.annotation.Contract;
+ import org.apache.http.auth.AuthScheme;
+ import org.apache.http.auth.AuthState;
+ import org.apache.http.auth.Credentials;
+@@ -55,7 +56,7 @@ import java.security.Principal;
+ *
+ * @since 4.0
+ */
+- at Immutable
++ at Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL)
+ public class DefaultAsyncUserTokenHandler implements UserTokenHandler {
+
+ public static final DefaultAsyncUserTokenHandler INSTANCE = new DefaultAsyncUserTokenHandler();
+diff --git a/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/HttpAsyncClientBuilder.java b/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/HttpAsyncClientBuilder.java
+index b7e9e6e..393756c 100644
+--- a/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/HttpAsyncClientBuilder.java
++++ b/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/HttpAsyncClientBuilder.java
+@@ -41,7 +41,6 @@ import org.apache.http.Header;
+ import org.apache.http.HttpHost;
+ import org.apache.http.HttpRequestInterceptor;
+ import org.apache.http.HttpResponseInterceptor;
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.auth.AuthSchemeProvider;
+ import org.apache.http.client.AuthenticationStrategy;
+ import org.apache.http.client.CookieStore;
+@@ -142,7 +141,6 @@ import org.apache.http.util.VersionInfo;
+ *
+ * @since 4.0
+ */
+- at NotThreadSafe
+ public class HttpAsyncClientBuilder {
+
+ private NHttpClientConnectionManager connManager;
+diff --git a/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/HttpAsyncClients.java b/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/HttpAsyncClients.java
+index da83c41..b9d9d55 100644
+--- a/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/HttpAsyncClients.java
++++ b/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/HttpAsyncClients.java
+@@ -27,7 +27,8 @@
+
+ package org.apache.http.impl.nio.client;
+
+-import org.apache.http.annotation.Immutable;
++import org.apache.http.annotation.ThreadingBehavior;
++import org.apache.http.annotation.Contract;
+ import org.apache.http.impl.nio.conn.PoolingNHttpClientConnectionManager;
+ import org.apache.http.nio.conn.NHttpClientConnectionManager;
+ import org.apache.http.nio.reactor.ConnectingIOReactor;
+@@ -39,7 +40,7 @@ import org.apache.http.util.Args;
+ *
+ * @since 4.0
+ */
+- at Immutable
++ at Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL)
+ public class HttpAsyncClients {
+
+ private HttpAsyncClients() {
+diff --git a/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MinimalHttpAsyncClientBuilder.java b/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MinimalHttpAsyncClientBuilder.java
+index a865dc7..fca8c7e 100644
+--- a/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MinimalHttpAsyncClientBuilder.java
++++ b/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MinimalHttpAsyncClientBuilder.java
+@@ -31,7 +31,6 @@ import java.util.concurrent.Executors;
+ import java.util.concurrent.ThreadFactory;
+
+ import org.apache.http.ConnectionReuseStrategy;
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.client.protocol.RequestAddCookies;
+ import org.apache.http.client.protocol.RequestClientConnControl;
+ import org.apache.http.client.protocol.ResponseProcessCookies;
+@@ -55,7 +54,6 @@ import org.apache.http.util.VersionInfo;
+ *
+ * @since 4.1
+ */
+- at NotThreadSafe
+ class MinimalHttpAsyncClientBuilder {
+
+ private NHttpClientConnectionManager connManager;
diff --git a/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/CPool.java b/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/CPool.java
index eaa1e18..8283152 100644
--- a/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/CPool.java
@@ -123,6 +238,25 @@ index ffe7286..4cadd58 100644
class CPoolEntry extends PoolEntry<HttpRoute, ManagedNHttpClientConnection> {
private final Log log;
+diff --git a/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/CPoolProxy.java b/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/CPoolProxy.java
+index 21dd86a..e38246c 100644
+--- a/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/CPoolProxy.java
++++ b/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/CPoolProxy.java
+@@ -35,14 +35,12 @@ import org.apache.http.HttpConnectionMetrics;
+ import org.apache.http.HttpException;
+ import org.apache.http.HttpRequest;
+ import org.apache.http.HttpResponse;
+-import org.apache.http.annotation.NotThreadSafe;
+ import org.apache.http.impl.conn.ConnectionShutdownException;
+ import org.apache.http.nio.NHttpClientConnection;
+ import org.apache.http.nio.conn.ManagedNHttpClientConnection;
+ import org.apache.http.nio.reactor.IOSession;
+ import org.apache.http.protocol.HttpContext;
+
+- at NotThreadSafe
+ class CPoolProxy implements ManagedNHttpClientConnection {
+
+ private volatile CPoolEntry poolEntry;
diff --git a/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingNHttpClientConnectionManager.java b/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingNHttpClientConnectionManager.java
index 21b3ed8..02cb924 100644
--- a/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingNHttpClientConnectionManager.java
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/httpcomponents-asyncclient.git
More information about the pkg-java-commits
mailing list