From f45aad28ca76ce859bfae6aa9cff650b9a34b85e Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 07 Feb 2014 15:41:31 +0000
Subject: [PATCH] Used StaticUtils.close().
---
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/ServerController.java | 29 +++++++++--------------------
1 files changed, 9 insertions(+), 20 deletions(-)
diff --git a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/ServerController.java b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/ServerController.java
index 7f71d5d..04db08c 100644
--- a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/ServerController.java
+++ b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/ServerController.java
@@ -24,28 +24,25 @@
* Copyright 2008-2010 Sun Microsystems, Inc.
* Portions Copyright 2011-2014 ForgeRock AS
*/
-
package org.opends.quicksetup.util;
-import org.opends.admin.ads.util.ConnectionUtils;
+import static org.opends.messages.QuickSetupMessages.*;
+import static org.opends.quicksetup.util.Utils.*;
+
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
-import static org.opends.messages.QuickSetupMessages.*;
-
+import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.opends.admin.ads.util.ConnectionUtils;
import org.opends.quicksetup.*;
-
-import static org.opends.quicksetup.util.Utils.*;
import org.opends.quicksetup.installer.InstallerHelper;
import org.opends.server.tools.ToolConstants;
import org.opends.server.util.SetupUtils;
+import org.opends.server.util.StaticUtils;
import javax.naming.NamingException;
import javax.naming.ldap.InitialLdapContext;
-
import java.util.ArrayList;
import java.util.Map;
-
-import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.io.IOException;
@@ -490,17 +487,7 @@
}
finally
{
- if (ctx != null)
- {
- try
- {
- ctx.close();
- }
- catch (Throwable t)
- {
- // do nothing
- }
- }
+ StaticUtils.close(ctx);
}
if (!connected)
{
@@ -581,6 +568,7 @@
isFirstLine = true;
Thread t = new Thread(new Runnable() {
+ @Override
public void run() {
try {
String line = reader.readLine();
@@ -665,6 +653,7 @@
Thread t = new Thread(new Runnable()
{
+ @Override
public void run()
{
try
--
Gitblit v1.10.0