From 420d0685be611af4544bcce545a380b9298c0d6a Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Fri, 28 May 2010 17:31:16 +0000
Subject: [PATCH] Fix for issue #4514 and #4533. Resolved some possible lock contention in ReplicationServerDomain, resulting in errors in logs. 

---
 opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java b/opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
index c5e3e2a..e472a43 100644
--- a/opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
+++ b/opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
@@ -3632,11 +3632,20 @@
     }
     if (search.getResultCode() != ResultCode.SUCCESS)
     {
-      Message message = ERR_SEARCHING_GENERATION_ID.get(
-          search.getResultCode().getResultCodeName() + " " +
-          search.getErrorMessage(),
-          baseDn.toString());
-      logError(message);
+      if (search.getResultCode() == ResultCode.NO_SUCH_OBJECT)
+      {
+        // nothing initialized yet
+        // don't log an error generationID will be computed.
+      }
+      else
+      {
+        //
+        Message message = ERR_SEARCHING_GENERATION_ID.get(
+            search.getResultCode().getResultCodeName() + " " +
+            search.getErrorMessage(),
+            baseDn.toString());
+        logError(message);
+      }
     }
     else
     {

--
Gitblit v1.10.0