From 195c215e1d99454dac2c3980af1a1241262dfa25 Mon Sep 17 00:00:00 2001
From: Bernard Metzler <bmt@zurich.ibm.com>
Date: Fri, 2 Oct 2020 15:47:48 +0200
Subject: [PATCH] RdmaServerEndpoint accept may return null, if listening
 endpoint closes.

---
 src/main/java/com/ibm/disni/RdmaServerEndpoint.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ibm/disni/RdmaServerEndpoint.java b/src/main/java/com/ibm/disni/RdmaServerEndpoint.java
index 1ea98844..244830bf 100644
--- a/src/main/java/com/ibm/disni/RdmaServerEndpoint.java
+++ b/src/main/java/com/ibm/disni/RdmaServerEndpoint.java
@@ -130,8 +130,12 @@ public C accept() throws IOException {
 				}
 			}
 			C endpoint = requested.poll();
-			logger.info("connect request received");
-			endpoint.accept();
+
+			// a null endpoint gets returned if listening endpoint closes
+			if (endpoint != null) {
+				logger.info("connect request received");
+				endpoint.accept();
+			}
 			return endpoint;
 		} catch (Exception e) {
 			throw new IOException(e);