From 6d1ebe16f8bfd23ef5de615dc7fab6468f7ef3f8 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 24 Dec 2014 15:01:44 +0000
Subject: [PATCH] Code cleanup
---
opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java
index 7ce0805..6423d53 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java
@@ -26,6 +26,10 @@
*/
package org.opends.server.replication.server;
+import static org.opends.messages.ConfigMessages.*;
+import static org.opends.messages.ReplicationMessages.*;
+import static org.opends.server.util.StaticUtils.*;
+
import java.io.IOException;
import java.net.*;
import java.util.*;
@@ -60,10 +64,6 @@
import org.opends.server.replication.service.DSRSShutdownSync;
import org.opends.server.types.*;
-import static org.opends.messages.ConfigMessages.*;
-import static org.opends.messages.ReplicationMessages.*;
-import static org.opends.server.util.StaticUtils.*;
-
/**
* ReplicationServer Listener. This singleton is the main object of the
* replication server. It waits for the incoming connections and create listener
@@ -869,12 +869,10 @@
public ConfigChangeResult applyConfigurationChange(
ReplicationServerCfg configuration)
{
- ResultCode resultCode = ResultCode.SUCCESS;
- boolean adminActionRequired = false;
+ final ConfigChangeResult ccr = new ConfigChangeResult();
// Some of those properties change don't need specific code.
- // They will be applied for next connections. Some others have immediate
- // effect
+ // They will be applied for next connections. Some others have immediate effect
final Set<HostPort> oldRSAddresses = getConfiguredRSAddresses();
final ReplicationServerCfg oldConfig = this.config;
@@ -897,7 +895,7 @@
catch (ChangelogException e)
{
logger.traceException(e);
- resultCode = ResultCode.OPERATIONS_ERROR;
+ ccr.setResultCode(ResultCode.OPERATIONS_ERROR);
}
}
@@ -962,9 +960,9 @@
final String newDir = config.getReplicationDBDirectory();
if (newDir != null && !newDir.equals(oldConfig.getReplicationDBDirectory()))
{
- adminActionRequired = true;
+ ccr.setAdminActionRequired(true);
}
- return new ConfigChangeResult(resultCode, adminActionRequired);
+ return ccr;
}
/**
--
Gitblit v1.10.0