[httpcomponents-client] 09/10: Fix 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 ad0abfd57b2a5c20a15d5c0eaba90dc28d935281
Author: Markus Koschany <apo at debian.org>
Date:   Thu Jul 14 23:17:30 2016 +0200

    Fix httpcore-ThreadSafe.patch
---
 debian/patches/httpcore-ThreadSafe.patch | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/patches/httpcore-ThreadSafe.patch b/debian/patches/httpcore-ThreadSafe.patch
index f9f957f..ce7f786 100644
--- a/debian/patches/httpcore-ThreadSafe.patch
+++ b/debian/patches/httpcore-ThreadSafe.patch
@@ -86,7 +86,7 @@ Subject: httpcore ThreadSafe
  .../client/DefaultRedirectStrategyAdaptor.java     |  5 +++--
  .../http/impl/client/DefaultRequestDirector.java   |  2 --
  .../client/DefaultTargetAuthenticationHandler.java |  5 +++--
- .../org/apache/http/impl/client/RoutedRequest.java |  5 +----
+ .../org/apache/http/impl/client/RoutedRequest.java |  6 ++----
  .../http/impl/client/SystemDefaultHttpClient.java  |  5 +++--
  .../http/impl/client/TunnelRefusedException.java   |  5 +++--
  .../http/impl/conn/AbstractClientConnAdapter.java  |  2 --
@@ -307,7 +307,7 @@ Subject: httpcore ThreadSafe
  .../org/apache/http/impl/execchain/RetryExec.java  |  5 +++--
  .../execchain/ServiceUnavailableRetryExec.java     |  5 +++--
  .../impl/execchain/TunnelRefusedException.java     |  5 +++--
- 304 files changed, 707 insertions(+), 658 deletions(-)
+ 304 files changed, 708 insertions(+), 658 deletions(-)
 
 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
@@ -2219,7 +2219,7 @@ index c47f9e0..aa9dffc 100644
  
      public DefaultTargetAuthenticationHandler() {
 diff --git a/httpclient/src/main/java-deprecated/org/apache/http/impl/client/RoutedRequest.java b/httpclient/src/main/java-deprecated/org/apache/http/impl/client/RoutedRequest.java
-index 43a0a80..02b83fb 100644
+index 43a0a80..d92f5a6 100644
 --- a/httpclient/src/main/java-deprecated/org/apache/http/impl/client/RoutedRequest.java
 +++ b/httpclient/src/main/java-deprecated/org/apache/http/impl/client/RoutedRequest.java
 @@ -27,7 +27,6 @@
@@ -2230,7 +2230,7 @@ index 43a0a80..02b83fb 100644
  import org.apache.http.conn.routing.HttpRoute;
  
  /**
-@@ -38,11 +37,9 @@ import org.apache.http.conn.routing.HttpRoute;
+@@ -38,11 +37,10 @@ import org.apache.http.conn.routing.HttpRoute;
   * @deprecated (4.3) do not use.
   */
  @Deprecated
@@ -2239,7 +2239,8 @@ index 43a0a80..02b83fb 100644
  
 -    protected final RequestWrapper request; // @NotThreadSafe
 -    protected final HttpRoute route; // @Immutable
-+    protected final HttpRoute route; // @Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL)
++     protected final RequestWrapper request; // @NotThreadSafe
++     protected final HttpRoute route; // @Immutable
  
      /**
       * Creates a new routed request.

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