mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Violette Roche-Montane
05.37.2014 9ea5c507098ed127ccb1f356d4c9adff310f783e
Fixed build failure due to 'closeSilently' which is not compatible with java6 when passing 'ServerSocket' in parameter.

1 files modified
14 ■■■■ changed files
opendj-server/src/main/java/org/forgerock/opendj/server/setup/model/ListenerSettings.java 14 ●●●● patch | view | raw | blame | history
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.
            }
        }
    }