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/guitools/org/opends/guitools/controlpanel/datamodel/ControlPanelInfo.java | 28 +++++++---------------------
1 files changed, 7 insertions(+), 21 deletions(-)
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/datamodel/ControlPanelInfo.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/datamodel/ControlPanelInfo.java
index ddb52f3..9f7911d 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/datamodel/ControlPanelInfo.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/datamodel/ControlPanelInfo.java
@@ -36,12 +36,11 @@
import java.util.Set;
import java.util.SortedSet;
-import org.forgerock.i18n.LocalizableMessage;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
-
import javax.naming.NamingException;
import javax.naming.ldap.InitialLdapContext;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.admin.ads.util.ApplicationTrustManager;
import org.opends.admin.ads.util.ConnectionUtils;
import org.opends.guitools.controlpanel.browser.IconPool;
@@ -62,6 +61,7 @@
import org.opends.quicksetup.util.UIKeyStore;
import org.opends.quicksetup.util.Utils;
import org.opends.server.tools.ConfigureWindowsService;
+import org.opends.server.util.StaticUtils;
/**
* This is the classes that is shared among all the different places in the
@@ -516,17 +516,8 @@
desc.setStatus(status);
if (status == ServerDescriptor.ServerStatus.STOPPING)
{
- if (ctx != null)
- {
- try
- {
- ctx.close();
- }
- catch (Throwable t)
- {
- }
- this.ctx = null;
- }
+ StaticUtils.close(ctx);
+ this.ctx = null;
if (userDataCtx != null)
{
if (connectionPool.isConnectionRegistered(userDataCtx))
@@ -539,13 +530,7 @@
{
}
}
- try
- {
- userDataCtx.close();
- }
- catch (Throwable t)
- {
- }
+ StaticUtils.close(userDataCtx);
userDataCtx = null;
}
}
@@ -819,6 +804,7 @@
poolingThread = new Thread(new Runnable()
{
+ @Override
public void run()
{
try
--
Gitblit v1.10.0