From d08f14dc5814aba9b887f982f510e6f3578c26b4 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Wed, 24 Aug 2011 13:56:29 +0000
Subject: [PATCH] Fix missing brackets in unit-test to avoid NPE (plus a few minor typos)

---
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java
index 47a3e66..d0755d5 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java
@@ -133,6 +133,7 @@
    *           If the environment could not be set up.
    */
   @BeforeClass
+  @Override
   public void setUp() throws Exception
   {
     super.setUp();
@@ -720,9 +721,11 @@
       for (int i = 0; i< THREADS; i++)
       {
         if (reader[i] != null)
+        {
           reader[i].join(10000);
-        // kill the thread in case it is not yet stopped.
-        reader[i].interrupt();
+          // kill the thread in case it is not yet stopped.
+          reader[i].interrupt();
+        }
       }
       debugInfo("multipleWriterMultipleReader reader's ended, now stop brokers");
       for (int i = 0; i< THREADS; i++)
@@ -1077,6 +1080,7 @@
    * @throws Exception If the environment could not be set up.
    */
   @AfterClass
+  @Override
   public void classCleanUp() throws Exception
   {
     callParanoiaCheck = false;
@@ -1450,7 +1454,7 @@
        DeleteMsg delMsg = new DeleteMsg("o=example,"+suffix, cn, "uid");
        l.add(delMsg);
      }
-     catch(Exception e) {};
+     catch(Exception ignored) {};
      return l;
    }
 

--
Gitblit v1.10.0