From 9ea5c507098ed127ccb1f356d4c9adff310f783e Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Wed, 05 Feb 2014 08:37:48 +0000
Subject: [PATCH] Fixed build failure due to 'closeSilently' which is not compatible with java6 when passing 'ServerSocket' in parameter.
---
opendj-server/src/main/java/org/forgerock/opendj/server/setup/model/ListenerSettings.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/opendj-server/src/main/java/org/forgerock/opendj/server/setup/model/ListenerSettings.java b/opendj-server/src/main/java/org/forgerock/opendj/server/setup/model/ListenerSettings.java
index ebf865f..8a8da52 100644
--- a/opendj-server/src/main/java/org/forgerock/opendj/server/setup/model/ListenerSettings.java
+++ b/opendj-server/src/main/java/org/forgerock/opendj/server/setup/model/ListenerSettings.java
@@ -30,8 +30,6 @@
import java.net.InetSocketAddress;
import java.net.ServerSocket;
-import static org.forgerock.util.Utils.closeSilently;
-
class ListenerSettings {
/** Default value for incrementing port number. */
@@ -265,7 +263,17 @@
socket.setReuseAddress(true);
socket.bind(new InetSocketAddress(portNumber));
} finally {
- closeSilently(socket);
+ close(socket);
+ }
+ }
+
+ private void close(ServerSocket socket) {
+ try {
+ if (socket != null) {
+ socket.close();
+ }
+ } catch (final IOException ignored) {
+ // Ignore.
}
}
}
--
Gitblit v1.10.0