Codebase list httpcomponents-asyncclient / debian/4.1-2
Update httpcore-ThreadSafe.patch Markus Koschany 7 years ago
1 changed file(s) with 135 addition(s) and 1 deletion(s). Raw diff Collapse all Expand all
+135
-1
debian/patches/httpcore-ThreadSafe.patch less more
77 .../org/apache/http/impl/client/cache/CachingHttpAsyncClient.java | 5 +++--
88 .../org/apache/http/impl/nio/conn/AsyncSchemeRegistryFactory.java | 5 +++--
99 .../org/apache/http/impl/nio/client/CloseableHttpAsyncClient.java | 5 +++--
10 .../apache/http/impl/nio/client/CloseableHttpPipeliningClient.java | 5 +++--
11 .../apache/http/impl/nio/client/DefaultAsyncUserTokenHandler.java | 5 +++--
12 .../java/org/apache/http/impl/nio/client/HttpAsyncClientBuilder.java | 2 --
13 .../main/java/org/apache/http/impl/nio/client/HttpAsyncClients.java | 5 +++--
14 .../apache/http/impl/nio/client/MinimalHttpAsyncClientBuilder.java | 2 --
1015 .../src/main/java/org/apache/http/impl/nio/conn/CPool.java | 5 +++--
1116 .../src/main/java/org/apache/http/impl/nio/conn/CPoolEntry.java | 5 +++--
17 .../src/main/java/org/apache/http/impl/nio/conn/CPoolProxy.java | 2 --
1218 .../http/impl/nio/conn/PoolingNHttpClientConnectionManager.java | 5 +++--
13 6 files changed, 18 insertions(+), 12 deletions(-)
19 12 files changed, 27 insertions(+), 24 deletions(-)
1420
1521 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
1622 index 9f2e425..136b3ae 100644
7985 public abstract class CloseableHttpAsyncClient implements HttpAsyncClient, Closeable {
8086
8187 public abstract boolean isRunning();
88 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
89 index 71890de..d52b271 100644
90 --- a/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/CloseableHttpPipeliningClient.java
91 +++ b/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/CloseableHttpPipeliningClient.java
92 @@ -33,7 +33,8 @@ import java.util.concurrent.Future;
93 import org.apache.http.HttpHost;
94 import org.apache.http.HttpRequest;
95 import org.apache.http.HttpResponse;
96 -import org.apache.http.annotation.ThreadSafe;
97 +import org.apache.http.annotation.ThreadingBehavior;
98 +import org.apache.http.annotation.Contract;
99 import org.apache.http.client.protocol.HttpClientContext;
100 import org.apache.http.concurrent.FutureCallback;
101 import org.apache.http.nio.client.HttpPipeliningClient;
102 @@ -49,7 +50,7 @@ import org.apache.http.util.Args;
103 *
104 * @since 4.1
105 */
106 -@ThreadSafe
107 +@Contract(threading = ThreadingBehavior.SAFE)
108 public abstract class CloseableHttpPipeliningClient
109 extends CloseableHttpAsyncClient implements HttpPipeliningClient {
110
111 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
112 index f599fdd..a493486 100644
113 --- a/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultAsyncUserTokenHandler.java
114 +++ b/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultAsyncUserTokenHandler.java
115 @@ -27,7 +27,8 @@
116 package org.apache.http.impl.nio.client;
117
118 import org.apache.http.HttpConnection;
119 -import org.apache.http.annotation.Immutable;
120 +import org.apache.http.annotation.ThreadingBehavior;
121 +import org.apache.http.annotation.Contract;
122 import org.apache.http.auth.AuthScheme;
123 import org.apache.http.auth.AuthState;
124 import org.apache.http.auth.Credentials;
125 @@ -55,7 +56,7 @@ import java.security.Principal;
126 *
127 * @since 4.0
128 */
129 -@Immutable
130 +@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL)
131 public class DefaultAsyncUserTokenHandler implements UserTokenHandler {
132
133 public static final DefaultAsyncUserTokenHandler INSTANCE = new DefaultAsyncUserTokenHandler();
134 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
135 index b7e9e6e..393756c 100644
136 --- a/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/HttpAsyncClientBuilder.java
137 +++ b/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/HttpAsyncClientBuilder.java
138 @@ -41,7 +41,6 @@ import org.apache.http.Header;
139 import org.apache.http.HttpHost;
140 import org.apache.http.HttpRequestInterceptor;
141 import org.apache.http.HttpResponseInterceptor;
142 -import org.apache.http.annotation.NotThreadSafe;
143 import org.apache.http.auth.AuthSchemeProvider;
144 import org.apache.http.client.AuthenticationStrategy;
145 import org.apache.http.client.CookieStore;
146 @@ -142,7 +141,6 @@ import org.apache.http.util.VersionInfo;
147 *
148 * @since 4.0
149 */
150 -@NotThreadSafe
151 public class HttpAsyncClientBuilder {
152
153 private NHttpClientConnectionManager connManager;
154 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
155 index da83c41..b9d9d55 100644
156 --- a/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/HttpAsyncClients.java
157 +++ b/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/HttpAsyncClients.java
158 @@ -27,7 +27,8 @@
159
160 package org.apache.http.impl.nio.client;
161
162 -import org.apache.http.annotation.Immutable;
163 +import org.apache.http.annotation.ThreadingBehavior;
164 +import org.apache.http.annotation.Contract;
165 import org.apache.http.impl.nio.conn.PoolingNHttpClientConnectionManager;
166 import org.apache.http.nio.conn.NHttpClientConnectionManager;
167 import org.apache.http.nio.reactor.ConnectingIOReactor;
168 @@ -39,7 +40,7 @@ import org.apache.http.util.Args;
169 *
170 * @since 4.0
171 */
172 -@Immutable
173 +@Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL)
174 public class HttpAsyncClients {
175
176 private HttpAsyncClients() {
177 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
178 index a865dc7..fca8c7e 100644
179 --- a/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MinimalHttpAsyncClientBuilder.java
180 +++ b/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MinimalHttpAsyncClientBuilder.java
181 @@ -31,7 +31,6 @@ import java.util.concurrent.Executors;
182 import java.util.concurrent.ThreadFactory;
183
184 import org.apache.http.ConnectionReuseStrategy;
185 -import org.apache.http.annotation.NotThreadSafe;
186 import org.apache.http.client.protocol.RequestAddCookies;
187 import org.apache.http.client.protocol.RequestClientConnControl;
188 import org.apache.http.client.protocol.ResponseProcessCookies;
189 @@ -55,7 +54,6 @@ import org.apache.http.util.VersionInfo;
190 *
191 * @since 4.1
192 */
193 -@NotThreadSafe
194 class MinimalHttpAsyncClientBuilder {
195
196 private NHttpClientConnectionManager connManager;
82197 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
83198 index eaa1e18..8283152 100644
84199 --- a/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/CPool.java
122237 class CPoolEntry extends PoolEntry<HttpRoute, ManagedNHttpClientConnection> {
123238
124239 private final Log log;
240 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
241 index 21dd86a..e38246c 100644
242 --- a/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/CPoolProxy.java
243 +++ b/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/CPoolProxy.java
244 @@ -35,14 +35,12 @@ import org.apache.http.HttpConnectionMetrics;
245 import org.apache.http.HttpException;
246 import org.apache.http.HttpRequest;
247 import org.apache.http.HttpResponse;
248 -import org.apache.http.annotation.NotThreadSafe;
249 import org.apache.http.impl.conn.ConnectionShutdownException;
250 import org.apache.http.nio.NHttpClientConnection;
251 import org.apache.http.nio.conn.ManagedNHttpClientConnection;
252 import org.apache.http.nio.reactor.IOSession;
253 import org.apache.http.protocol.HttpContext;
254
255 -@NotThreadSafe
256 class CPoolProxy implements ManagedNHttpClientConnection {
257
258 private volatile CPoolEntry poolEntry;
125259 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
126260 index 21b3ed8..02cb924 100644
127261 --- a/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingNHttpClientConnectionManager.java