From ec6fcea7eb3b1013db8b26ff65327d3ab24077c9 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Fri, 09 Sep 2016 09:45:26 +0000
Subject: [PATCH] OPENDJ-3089 Several minor fixes from the PR
---
opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/MultimasterReplication.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/MultimasterReplication.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/MultimasterReplication.java
index c632fb8..3808506 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/MultimasterReplication.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/MultimasterReplication.java
@@ -276,11 +276,7 @@
}
// If any schema changes were made with the server offline, then handle them now.
- List<Modification> offlineSchemaChanges = serverContext.getSchemaHandler().getOfflineSchemaModifications();
- if (offlineSchemaChanges != null && !offlineSchemaChanges.isEmpty())
- {
- processSchemaChange(offlineSchemaChanges);
- }
+ processSchemaChange(serverContext.getSchemaHandler().getOfflineSchemaModifications());
DirectoryServer.registerBackupTaskListener(this);
DirectoryServer.registerRestoreTaskListener(this);
@@ -580,10 +576,13 @@
@Override
public void processSchemaChange(List<Modification> modifications)
{
- LDAPReplicationDomain domain = findDomain(DirectoryServer.getSchemaDN(), null);
- if (domain != null)
+ if (!modifications.isEmpty())
{
- domain.synchronizeSchemaModifications(modifications);
+ LDAPReplicationDomain domain = findDomain(DirectoryServer.getSchemaDN(), null);
+ if (domain != null)
+ {
+ domain.synchronizeSchemaModifications(modifications);
+ }
}
}
--
Gitblit v1.10.0