[async-http-client] 05/08: Fixed a compilation error with Java 8 (Closes: #773372)

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository async-http-client.

commit 800608b1bed51e5f5649446357cebaf93594c63e
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Dec 17 17:27:59 2014 +0100

    Fixed a compilation error with Java 8 (Closes: #773372)
---
 debian/changelog                            |  1 +
 debian/patches/01-java8-compatibility.patch | 27 +++++++++++++++++++++++++++
 debian/patches/series                       |  1 +
 3 files changed, 29 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0f45d3e..c2c81f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ async-http-client (1.6.5-3) UNRELEASED; urgency=medium
   * Update debian/watch
 
   [ Emmanuel Bourg ]
+  * Fixed a compilation error with Java 8 (Closes: #773372)
   * Standards-Version updated to 3.9.6 (no changes)
   * Removed the unnecessary build dependency on libclirr-maven-plugin-java
   * Use canonical URLs for the Vcs-* fields
diff --git a/debian/patches/01-java8-compatibility.patch b/debian/patches/01-java8-compatibility.patch
new file mode 100644
index 0000000..b93911e
--- /dev/null
+++ b/debian/patches/01-java8-compatibility.patch
@@ -0,0 +1,27 @@
+Description: Fix a compilation error with Java 8. This has been fixed upstream
+ in the version 1.9 by renaming the replace() method to replaceWith().
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+Bug-Debian: http://bugs.debian.org/773372
+--- a/src/main/java/com/ning/http/client/FluentStringsMap.java
++++ b/src/main/java/com/ning/http/client/FluentStringsMap.java
+@@ -148,7 +148,7 @@
+      * @return This object
+      */
+     public FluentStringsMap replace(final String key, final String... values) {
+-        return replace(key, Arrays.asList(values));
++        return replace(key, (Collection<String>) Arrays.asList(values));
+     }
+ 
+     /**
+--- a/src/main/java/com/ning/http/client/FluentCaseInsensitiveStringsMap.java
++++ b/src/main/java/com/ning/http/client/FluentCaseInsensitiveStringsMap.java
+@@ -162,7 +162,7 @@
+      * @return This object
+      */
+     public FluentCaseInsensitiveStringsMap replace(final String key, final String... values) {
+-        return replace(key, Arrays.asList(values));
++        return replace(key, (Collection<String>) Arrays.asList(values));
+     }
+ 
+     /**
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3209aba
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-java8-compatibility.patch

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