From 972a60184e797cd1f3895fb79373237b4f1ed068 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Mon, 26 Aug 2013 12:09:43 +0000
Subject: [PATCH] Trivial fix - closing streams with StaticUtils

---
 opends/tests/unit-tests-testng/src/server/org/opends/server/tools/UpgradeTestCase.java |   27 +++++++++++++++------------
 1 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/UpgradeTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/UpgradeTestCase.java
index feaaf67..5a7661d 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/UpgradeTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/UpgradeTestCase.java
@@ -40,6 +40,7 @@
 import org.opends.server.tools.upgrade.UpgradeCli;
 import org.opends.server.types.DirectoryException;
 import org.opends.server.types.InitializationException;
+import org.opends.server.util.StaticUtils;
 import org.testng.annotations.Test;
 
 import static org.opends.messages.ToolMessages.*;
@@ -56,10 +57,13 @@
       + File.separator + "config" + File.separator + "config.ldif";
 
   /**
-   * Sets the args for the upgrade tools. The configFile parameter is
-   * configured by default.<pre>
+   * Sets the args for the upgrade tools. The configFile parameter is configured
+   * by default.
+   *
+   * <pre>
    * usage : {@code}setArgs("--force", "--no-prompt") {@code}
-   * corresponds to command line : ./upgrade --force -n</pre>
+   * corresponds to command line : ./upgrade --force -n
+   * </pre>
    *
    * @param args
    *          The argument you want for testing.
@@ -96,8 +100,7 @@
       final Message expectedMessage)
   {
     return (output.replaceAll("\n", " ").replaceAll("%s", " ").indexOf(
-        expectedMessage.toString().replaceAll("\n", " ")
-        .replaceAll("%s", " ")) != -1);
+        expectedMessage.toString().replaceAll("\n", " ").replaceAll("%s", " ")) != -1);
   }
 
   /**
@@ -119,7 +122,7 @@
     }
     finally
     {
-      ps.close();
+      StaticUtils.close(ps, baos);
     }
   }
 
@@ -142,7 +145,7 @@
     }
     finally
     {
-      ps.close();
+      StaticUtils.close(ps, baos);
     }
   }
 
@@ -165,7 +168,7 @@
     }
     finally
     {
-      ps.close();
+      StaticUtils.close(ps, baos);
     }
   }
 
@@ -188,7 +191,7 @@
     }
     finally
     {
-      ps.close();
+      StaticUtils.close(ps, baos);
     }
   }
 
@@ -211,7 +214,7 @@
     }
     finally
     {
-      ps.close();
+      StaticUtils.close(ps, baos);
     }
   }
 
@@ -238,7 +241,7 @@
     }
     finally
     {
-      ps.close();
+      StaticUtils.close(ps, baos);
     }
   }
 
@@ -273,7 +276,7 @@
     }
     finally
     {
-      ps.close();
+      StaticUtils.close(ps, baos);
       TestCaseUtils
           .shutdownServer("testUpgradeToolAllowsNonInteractiveAndForce");
     }

--
Gitblit v1.10.0