svn commit: r527146 - in head/java/openjdk11: . files

[Greg Lewis]

Author: glewis
Date: Wed Feb 26 00:07:14 2020
New Revision: 527146
URL: https://svnweb.freebsd.org/changeset/ports/527146

Log:
  Ignore ECONNRESET when closing a socket
  
  See https://github.com/battleblow/openjdk-jdk11u/issues/94 for details

Added:
  head/java/openjdk11/files/patch-src_java.base_unix_native_libnio_ch_FileDispatcherImpl.c   (contents, props changed)
Modified:
  head/java/openjdk11/Makefile

Modified: head/java/openjdk11/Makefile
==============================================================================
--- head/java/openjdk11/Makefile	Tue Feb 25 23:42:37 2020	(r527145)
+++ head/java/openjdk11/Makefile	Wed Feb 26 00:07:14 2020	(r527146)
@@ -3,6 +3,7 @@
 PORTNAME=	openjdk
 DISTVERSIONPREFIX=	jdk-
 DISTVERSION=	${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION}
+PORTREVISION=	1
 CATEGORIES=	java devel
 PKGNAMESUFFIX?=	${JDK_MAJOR_VERSION}
 

Added: head/java/openjdk11/files/patch-src_java.base_unix_native_libnio_ch_FileDispatcherImpl.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/java/openjdk11/files/patch-src_java.base_unix_native_libnio_ch_FileDispatcherImpl.c	Wed Feb 26 00:07:14 2020	(r527146)
@@ -0,0 +1,11 @@
+--- src/java.base/unix/native/libnio/ch/FileDispatcherImpl.c
++++ src/java.base/unix/native/libnio/ch/FileDispatcherImpl.c
+@@ -291,7 +291,7 @@ Java_sun_nio_ch_FileDispatcherImpl_release0(JNIEnv *env, jobject this,
+ static void closeFileDescriptor(JNIEnv *env, int fd) {
+     if (fd != -1) {
+         int result = close(fd);
+-        if (result < 0)
++        if (result < 0 && errno != ECONNRESET)
+             JNU_ThrowIOExceptionWithLastError(env, "Close failed");
+     }
+ }