From 833ef2eb5fc04139d6b41b4bb96dc4db84e828d5 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Fri, 30 Aug 2013 10:02:05 +0000
Subject: [PATCH] More code cleanup and use of interfaces in dsreplication and ADS.
---
opends/src/ads/org/opends/admin/ads/util/ServerLoader.java | 19 +++++++------------
1 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/opends/src/ads/org/opends/admin/ads/util/ServerLoader.java b/opends/src/ads/org/opends/admin/ads/util/ServerLoader.java
index d8aa18f..bae1020 100644
--- a/opends/src/ads/org/opends/admin/ads/util/ServerLoader.java
+++ b/opends/src/ads/org/opends/admin/ads/util/ServerLoader.java
@@ -23,12 +23,14 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2013 ForgeRock AS.
*/
package org.opends.admin.ads.util;
import java.util.LinkedHashSet;
import java.util.Map;
+import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -45,6 +47,8 @@
import org.opends.admin.ads.TopologyCacheFilter;
import org.opends.admin.ads.ADSContext.ServerProperty;
+import static org.opends.server.util.StaticUtils.close;
+
/**
* Class used to load the configuration of a server. Basically the code
* uses some provided properties and authentication information to connect
@@ -63,7 +67,7 @@
private int timeout;
private String dn;
private String pwd;
- private LinkedHashSet<PreferredConnection> preferredLDAPURLs;
+ private final LinkedHashSet<PreferredConnection> preferredLDAPURLs;
private TopologyCacheFilter filter;
private static final Logger LOG =
@@ -88,7 +92,7 @@
public ServerLoader(Map<ServerProperty,Object> serverProperties,
String dn, String pwd, ApplicationTrustManager trustManager,
int timeout,
- LinkedHashSet<PreferredConnection> preferredLDAPURLs,
+ Set<PreferredConnection> preferredLDAPURLs,
TopologyCacheFilter filter)
{
this.serverProperties = serverProperties;
@@ -235,16 +239,7 @@
finally
{
isOver = true;
- try
- {
- if (ctx != null)
- {
- ctx.close();
- }
- }
- catch (Throwable t)
- {
- }
+ close(ctx);
}
}
--
Gitblit v1.10.0