From 751942c9f9f71f10702cfbf8af9f9b3e3eb85682 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 02 Jul 2013 13:05:40 +0000
Subject: [PATCH] ReplicationServer.java: Added a toString() method. Removed useless instance creation.

---
 opends/src/server/org/opends/server/replication/server/ReplicationServer.java |   35 ++++++++++++++---------------------
 1 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/opends/src/server/org/opends/server/replication/server/ReplicationServer.java b/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
index 6d5b473..a67fc0e 100644
--- a/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
+++ b/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
@@ -46,7 +46,7 @@
 import org.opends.messages.Severity;
 import org.opends.server.admin.server.ConfigurationChangeListener;
 import org.opends.server.admin.std.meta.VirtualAttributeCfgDefn;
-import org.opends.server.admin.std.meta.VirtualAttributeCfgDefn.*;
+import org.opends.server.admin.std.meta.VirtualAttributeCfgDefn.ConflictBehavior;
 import org.opends.server.admin.std.server.ReplicationServerCfg;
 import org.opends.server.admin.std.server.UserDefinedVirtualAttributeCfg;
 import org.opends.server.api.*;
@@ -1033,17 +1033,11 @@
       }
       catch (IOException e)
       {
-        Message message = ERR_COULD_NOT_CLOSE_THE_SOCKET.get(e.toString());
-        logError(message);
-        new ConfigChangeResult(DirectoryServer.getServerErrorResultCode(),
-                               false);
+        logError(ERR_COULD_NOT_CLOSE_THE_SOCKET.get(e.toString()));
       }
       catch (InterruptedException e)
       {
-        Message message = ERR_COULD_NOT_STOP_LISTEN_THREAD.get(e.toString());
-        logError(message);
-        new ConfigChangeResult(DirectoryServer.getServerErrorResultCode(),
-                               false);
+        logError(ERR_COULD_NOT_STOP_LISTEN_THREAD.get(e.toString()));
       }
     }
 
@@ -1426,10 +1420,7 @@
     {
       return domains.iterator();
     }
-    else
-    {
-      return null;
-    }
+    return null;
   }
 
   /**
@@ -1741,10 +1732,7 @@
       {
         return draftCNDbHandler.getFirstKey();
       }
-      else
-      {
-        return 0;
-      }
+      return 0;
     }
   }
 
@@ -1760,10 +1748,7 @@
       {
         return draftCNDbHandler.getLastKey();
       }
-      else
-      {
-        return 0;
-      }
+      return 0;
     }
   }
 
@@ -2015,4 +2000,12 @@
       return url;
     }
   }
+
+  /** {@inheritDoc} */
+  @Override
+  public String toString()
+  {
+    return "RS(" + serverId + ") on " + serverURL + ", domains="
+        + baseDNs.keySet();
+  }
 }

--
Gitblit v1.10.0