[httpcomponents-asyncclient] 03/06: Add httpcore-ThreadSafe.patch and fix FTBFS due to missing class.
Markus Koschany
apo at moszumanska.debian.org
Thu Jul 14 17:31:38 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 5d636717c161f5ce2fd6c7500c706b32042e2eae
Author: Markus Koschany <apo at debian.org>
Date: Thu Jul 14 19:10:44 2016 +0200
Add httpcore-ThreadSafe.patch and fix FTBFS due to missing class.
Closes: #828822
Thanks: Daniel Schepler for the report.
---
debian/patches/httpcore-ThreadSafe.patch | 146 +++++++++++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 147 insertions(+)
diff --git a/debian/patches/httpcore-ThreadSafe.patch b/debian/patches/httpcore-ThreadSafe.patch
new file mode 100644
index 0000000..de5e478
--- /dev/null
+++ b/debian/patches/httpcore-ThreadSafe.patch
@@ -0,0 +1,146 @@
+From: Markus Koschany <apo at debian.org>
+Date: Thu, 14 Jul 2016 19:10:24 +0200
+Subject: httpcore-ThreadSafe
+
+---
+ .../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 +++--
+ .../src/main/java/org/apache/http/impl/nio/conn/CPool.java | 5 +++--
+ .../src/main/java/org/apache/http/impl/nio/conn/CPoolEntry.java | 5 +++--
+ .../http/impl/nio/conn/PoolingNHttpClientConnectionManager.java | 5 +++--
+ 6 files changed, 18 insertions(+), 12 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
+--- 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
+@@ -48,7 +48,8 @@ import org.apache.http.HttpVersion;
+ import org.apache.http.ProtocolException;
+ import org.apache.http.ProtocolVersion;
+ import org.apache.http.RequestLine;
+-import org.apache.http.annotation.ThreadSafe;
++import org.apache.http.annotation.ThreadingBehavior;
++import org.apache.http.annotation.Contract;
+ import org.apache.http.client.ClientProtocolException;
+ import org.apache.http.client.cache.CacheResponseStatus;
+ import org.apache.http.client.cache.HeaderConstants;
+@@ -76,7 +77,7 @@ import org.apache.http.util.Args;
+ import org.apache.http.util.EntityUtils;
+ import org.apache.http.util.VersionInfo;
+
+- at ThreadSafe // So long as the responseCache implementation is threadsafe
++ at Contract(threading = ThreadingBehavior.SAFE_CONDITIONAL) // So long as the responseCache implementation is threadsafe
+ public class CachingHttpAsyncClient implements HttpAsyncClient {
+
+ private final static boolean SUPPORTS_RANGE_AND_CONTENT_RANGE_HEADERS = false;
+diff --git a/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/AsyncSchemeRegistryFactory.java b/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/AsyncSchemeRegistryFactory.java
+index 16d86d1..e356bf4 100644
+--- a/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/AsyncSchemeRegistryFactory.java
++++ b/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/AsyncSchemeRegistryFactory.java
+@@ -26,13 +26,14 @@
+ */
+ package org.apache.http.impl.nio.conn;
+
+-import org.apache.http.annotation.ThreadSafe;
++import org.apache.http.annotation.ThreadingBehavior;
++import org.apache.http.annotation.Contract;
+ import org.apache.http.nio.conn.scheme.AsyncScheme;
+ import org.apache.http.nio.conn.scheme.AsyncSchemeRegistry;
+ import org.apache.http.nio.conn.ssl.SSLLayeringStrategy;
+
+ @Deprecated
+- at ThreadSafe
++ at Contract(threading = ThreadingBehavior.SAFE)
+ public final class AsyncSchemeRegistryFactory {
+
+ public static AsyncSchemeRegistry createDefault() {
+diff --git a/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/CloseableHttpAsyncClient.java b/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/CloseableHttpAsyncClient.java
+index 33f7f5a..6409877 100644
+--- a/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/CloseableHttpAsyncClient.java
++++ b/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/CloseableHttpAsyncClient.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.ClientProtocolException;
+ import org.apache.http.client.methods.HttpUriRequest;
+ import org.apache.http.client.protocol.HttpClientContext;
+@@ -52,7 +53,7 @@ import org.apache.http.util.Args;
+ *
+ * @since 4.0
+ */
+- at ThreadSafe
++ at Contract(threading = ThreadingBehavior.SAFE)
+ public abstract class CloseableHttpAsyncClient implements HttpAsyncClient, Closeable {
+
+ public abstract boolean isRunning();
+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
++++ b/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/CPool.java
+@@ -30,7 +30,8 @@ import java.util.concurrent.TimeUnit;
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+-import org.apache.http.annotation.ThreadSafe;
++import org.apache.http.annotation.ThreadingBehavior;
++import org.apache.http.annotation.Contract;
+ import org.apache.http.conn.routing.HttpRoute;
+ import org.apache.http.nio.NHttpClientConnection;
+ import org.apache.http.nio.conn.ManagedNHttpClientConnection;
+@@ -39,7 +40,7 @@ import org.apache.http.nio.pool.NIOConnFactory;
+ import org.apache.http.nio.pool.SocketAddressResolver;
+ import org.apache.http.nio.reactor.ConnectingIOReactor;
+
+- at ThreadSafe
++ at Contract(threading = ThreadingBehavior.SAFE)
+ class CPool extends AbstractNIOConnPool<HttpRoute, ManagedNHttpClientConnection, CPoolEntry> {
+
+ private final Log log = LogFactory.getLog(CPool.class);
+diff --git a/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/CPoolEntry.java b/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/CPoolEntry.java
+index ffe7286..4cadd58 100644
+--- a/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/CPoolEntry.java
++++ b/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/CPoolEntry.java
+@@ -31,12 +31,13 @@ import java.util.Date;
+ import java.util.concurrent.TimeUnit;
+
+ import org.apache.commons.logging.Log;
+-import org.apache.http.annotation.ThreadSafe;
++import org.apache.http.annotation.ThreadingBehavior;
++import org.apache.http.annotation.Contract;
+ import org.apache.http.conn.routing.HttpRoute;
+ import org.apache.http.nio.conn.ManagedNHttpClientConnection;
+ import org.apache.http.pool.PoolEntry;
+
+- at ThreadSafe
++ at Contract(threading = ThreadingBehavior.SAFE)
+ class CPoolEntry extends PoolEntry<HttpRoute, ManagedNHttpClientConnection> {
+
+ private final Log log;
+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
++++ b/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingNHttpClientConnectionManager.java
+@@ -39,7 +39,8 @@ import java.util.concurrent.TimeUnit;
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+ import org.apache.http.HttpHost;
+-import org.apache.http.annotation.ThreadSafe;
++import org.apache.http.annotation.ThreadingBehavior;
++import org.apache.http.annotation.Contract;
+ import org.apache.http.concurrent.BasicFuture;
+ import org.apache.http.concurrent.FutureCallback;
+ import org.apache.http.config.ConnectionConfig;
+@@ -88,7 +89,7 @@ import org.apache.http.util.Asserts;
+ *
+ * @since 4.0
+ */
+- at ThreadSafe
++ at Contract(threading = ThreadingBehavior.SAFE)
+ public class PoolingNHttpClientConnectionManager
+ implements NHttpClientConnectionManager, ConnPoolControl<HttpRoute> {
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..51ae64f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+httpcore-ThreadSafe.patch
--
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