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/plugin/LDAPReplicationDomain.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
index ce77320..8c61a30 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
@@ -26,6 +26,17 @@
*/
package org.opends.server.replication.plugin;
+import static org.forgerock.opendj.ldap.ResultCode.*;
+import static org.opends.messages.ReplicationMessages.*;
+import static org.opends.messages.ToolMessages.*;
+import static org.opends.server.protocols.internal.InternalClientConnection.*;
+import static org.opends.server.protocols.internal.Requests.*;
+import static org.opends.server.replication.plugin.EntryHistorical.*;
+import static org.opends.server.replication.protocol.OperationContext.*;
+import static org.opends.server.replication.service.ReplicationMonitor.*;
+import static org.opends.server.util.ServerConstants.*;
+import static org.opends.server.util.StaticUtils.*;
+
import java.io.File;
import java.io.InputStream;
import java.io.OutputStream;
@@ -91,17 +102,6 @@
import org.opends.server.util.TimeThread;
import org.opends.server.workflowelement.localbackend.LocalBackendModifyOperation;
-import static org.forgerock.opendj.ldap.ResultCode.*;
-import static org.opends.messages.ReplicationMessages.*;
-import static org.opends.messages.ToolMessages.*;
-import static org.opends.server.protocols.internal.InternalClientConnection.*;
-import static org.opends.server.protocols.internal.Requests.*;
-import static org.opends.server.replication.plugin.EntryHistorical.*;
-import static org.opends.server.replication.protocol.OperationContext.*;
-import static org.opends.server.replication.service.ReplicationMonitor.*;
-import static org.opends.server.util.ServerConstants.*;
-import static org.opends.server.util.StaticUtils.*;
-
/**
* This class implements the bulk part of the Directory Server side
* of the replication code.
@@ -3850,16 +3850,16 @@
solveConflictFlag = isSolveConflict(configuration);
+ final ConfigChangeResult ccr = new ConfigChangeResult();
try
{
storeECLConfiguration(configuration);
}
catch(Exception e)
{
- return new ConfigChangeResult(ResultCode.OTHER, false);
+ ccr.setResultCode(ResultCode.OTHER);
}
-
- return new ConfigChangeResult(ResultCode.SUCCESS, false);
+ return ccr;
}
/** {@inheritDoc} */
--
Gitblit v1.10.0