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/server/org/opends/server/tools/LDAPReader.java | 37 +++++++------------------------------
1 files changed, 7 insertions(+), 30 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPReader.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPReader.java
index e4cc900..7132ab3 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPReader.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPReader.java
@@ -32,14 +32,15 @@
import java.net.Socket;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.io.ASN1;
-import org.forgerock.opendj.ldap.DecodeException;
import org.forgerock.opendj.io.ASN1Reader;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.DecodeException;
import org.opends.server.protocols.ldap.LDAPMessage;
import org.opends.server.types.LDAPException;
import org.opends.server.types.RecordingInputStream;
import org.opends.server.util.ServerConstants;
+import org.opends.server.util.StaticUtils;
/**
* This class defines a utility that can be used to read LDAP messages from a
@@ -104,14 +105,8 @@
ByteString bytesRead = debugInputStream.getRecordedBytes();
debugInputStream.clearRecordedBytes();
- StringBuilder builder = new StringBuilder();
- builder.append("bytes read from wire(len=");
- builder.append(bytesRead.length());
- builder.append("):");
- builder.append(ServerConstants.EOL);
- builder.append(bytesRead.toHexPlusAsciiString(4));
-
- logger.trace(builder.toString());
+ logger.trace("bytes read from wire(len=" + bytesRead.length() + "):"
+ + ServerConstants.EOL + bytesRead.toHexPlusAsciiString(4));
logger.trace(message.toString());
}
@@ -124,25 +119,7 @@
@Override
public void close()
{
- try
- {
- asn1Reader.close();
- }
- catch (Exception e)
- {
- logger.traceException(e);
- }
-
- if (socket != null)
- {
- try
- {
- socket.close();
- }
- catch (Exception e)
- {
- logger.traceException(e);
- }
- }
+ StaticUtils.close(asn1Reader);
+ StaticUtils.close(socket);
}
}
--
Gitblit v1.10.0