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/WaitForFileDelete.java |   32 +++++++++++---------------------
 1 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/WaitForFileDelete.java b/opendj3-server-dev/src/server/org/opends/server/tools/WaitForFileDelete.java
index 5f7c4a3..25546dc 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/WaitForFileDelete.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/WaitForFileDelete.java
@@ -26,28 +26,19 @@
  */
 package org.opends.server.tools;
 
-import java.io.File;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintStream;
-import java.io.RandomAccessFile;
+import java.io.*;
 
 import org.forgerock.i18n.LocalizableMessage;
 import org.opends.server.core.DirectoryServer;
 import org.opends.server.types.NullOutputStream;
-import com.forgerock.opendj.cli.ArgumentException;
-import com.forgerock.opendj.cli.ArgumentParser;
-import com.forgerock.opendj.cli.BooleanArgument;
-import com.forgerock.opendj.cli.IntegerArgument;
-import com.forgerock.opendj.cli.StringArgument;
 import org.opends.server.util.cli.ConsoleApplication;
 
-import static org.opends.messages.ToolMessages.*;
+import com.forgerock.opendj.cli.*;
+
 import static org.opends.messages.CoreMessages.*;
+import static org.opends.messages.ToolMessages.*;
 import static org.opends.server.util.StaticUtils.*;
 
-
-
 /**
  * This program provides a simple tool that will wait for a specified file to be
  * deleted before exiting.  It can be used in the process of confirming that the
@@ -394,14 +385,7 @@
       }
     }
 
-    if (outputFile != null)
-    {
-      try
-      {
-        outputFile.close();
-      }
-      catch (Throwable t) {}
-    }
+    close(outputFile);
 
     if (targetFile.exists())
     {
@@ -419,6 +403,7 @@
   /**
    * {@inheritDoc}
    */
+  @Override
   public boolean isAdvancedMode()
   {
     return false;
@@ -427,6 +412,7 @@
   /**
    * {@inheritDoc}
    */
+  @Override
   public boolean isInteractive()
   {
     return false;
@@ -435,6 +421,7 @@
   /**
    * {@inheritDoc}
    */
+  @Override
   public boolean isMenuDrivenMode()
   {
     return false;
@@ -443,6 +430,7 @@
   /**
    * {@inheritDoc}
    */
+  @Override
   public boolean isQuiet()
   {
     return false;
@@ -451,6 +439,7 @@
   /**
    * {@inheritDoc}
    */
+  @Override
   public boolean isScriptFriendly()
   {
     return false;
@@ -459,6 +448,7 @@
   /**
    * {@inheritDoc}
    */
+  @Override
   public boolean isVerbose()
   {
     return false;

--
Gitblit v1.10.0