[httpcomponents-client] 05/10: Rebase httpcore-ThreadSafe.patch

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository httpcomponents-client.

commit 578b2568e938ffbd7167f45ca26899dd7392de02
Author: Markus Koschany <apo at debian.org>
Date:   Thu Jul 14 23:02:31 2016 +0200

    Rebase httpcore-ThreadSafe.patch
---
 debian/patches/httpcore-ThreadSafe.patch | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/debian/patches/httpcore-ThreadSafe.patch b/debian/patches/httpcore-ThreadSafe.patch
index 4a3b2b7..54ff969 100644
--- a/debian/patches/httpcore-ThreadSafe.patch
+++ b/debian/patches/httpcore-ThreadSafe.patch
@@ -1,9 +1,8 @@
 From: Markus Koschany <apo at debian.org>
-Date: Thu, 14 Jul 2016 22:55:45 +0200
+Date: Thu, 14 Jul 2016 23:02:50 +0200
 Subject: httpcore ThreadSafe
 
 ---
- debian/patches/httpcore-ThreadSafe.patch                      |  1 -
  .../client/fluent/InternalEntityEnclosingHttpRequest.java     |  2 --
  .../org/apache/http/client/fluent/InternalHttpRequest.java    |  2 --
  .../org/apache/http/impl/client/cache/CachingHttpClient.java  |  5 +++--
@@ -307,20 +306,8 @@ Subject: httpcore ThreadSafe
  .../main/java/org/apache/http/impl/execchain/RetryExec.java   |  5 +++--
  .../http/impl/execchain/ServiceUnavailableRetryExec.java      |  5 +++--
  .../apache/http/impl/execchain/TunnelRefusedException.java    |  5 +++--
- 304 files changed, 707 insertions(+), 614 deletions(-)
+ 303 files changed, 707 insertions(+), 613 deletions(-)
 
-diff --git a/debian/patches/httpcore-ThreadSafe.patch b/debian/patches/httpcore-ThreadSafe.patch
-index 297e499..9eee152 100644
---- a/debian/patches/httpcore-ThreadSafe.patch
-+++ b/debian/patches/httpcore-ThreadSafe.patch
-@@ -1679,7 +1679,6 @@ index 43a0a80..bde608a 100644
- @@ -42,7 +42,7 @@ import org.apache.http.conn.routing.HttpRoute;
-  public class RoutedRequest {
-  
--     protected final RequestWrapper request; // @NotThreadSafe
- -    protected final HttpRoute route; // @Immutable
- +    protected final HttpRoute route; // @Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL)
-  
 diff --git a/fluent-hc/src/main/java/org/apache/http/client/fluent/InternalEntityEnclosingHttpRequest.java b/fluent-hc/src/main/java/org/apache/http/client/fluent/InternalEntityEnclosingHttpRequest.java
 index 6e0b4d6..a7972b8 100644
 --- a/fluent-hc/src/main/java/org/apache/http/client/fluent/InternalEntityEnclosingHttpRequest.java

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/httpcomponents-client.git