[gradle] 01/01: Improved the Java 8 compatibility patch

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository gradle.

commit 852acca9dbafe13a6a3acc78c1cfa25de1f8d303
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Apr 5 08:40:01 2018 +0200

    Improved the Java 8 compatibility patch
---
 debian/changelog                         | 7 +++++++
 debian/patches/java8-compatibility.patch | 9 ++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 98057b6..99fceed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gradle (3.4.1-6) unstable; urgency=medium
+
+  * Team upload.
+  * Improved the Java 8 compatibility patch
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 05 Apr 2018 08:39:52 +0200
+
 gradle (3.4.1-5) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/java8-compatibility.patch b/debian/patches/java8-compatibility.patch
index b96bccf..a429a92 100644
--- a/debian/patches/java8-compatibility.patch
+++ b/debian/patches/java8-compatibility.patch
@@ -21,7 +21,14 @@ Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gradle/+bug/1760359
          }
  
          @Override
-@@ -185,13 +186,13 @@
+@@ -179,19 +180,19 @@
+                     return -1;
+                 }
+ 
+-                buffer.clear();
++                ((Buffer) buffer).clear();
+                 int nread;
+                 try {
                      nread = socket.read(buffer);
                  } catch (IOException e) {
                      if (isEndOfStream(e)) {

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