From b5acb25ee2ad9bf8b166b9de1a34e6aab6ea23b7 Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Fri, 01 Sep 2006 12:04:47 +0000
Subject: [PATCH] issue 604 : solve the naming conflict that might happen when several masters are used there are 3 main parts in this commit : - attach the replication context in an OperationContext - if operation replay fails then fix the problem  - in the pre-op checks for conflict and cause failure if necessary most of the time there should be no conflict and the operation should be processed normally

---
 opends/src/server/org/opends/server/changelog/ChangelogDB.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/opends/src/server/org/opends/server/changelog/ChangelogDB.java b/opends/src/server/org/opends/server/changelog/ChangelogDB.java
index d9e09a8..e03e7b6 100644
--- a/opends/src/server/org/opends/server/changelog/ChangelogDB.java
+++ b/opends/src/server/org/opends/server/changelog/ChangelogDB.java
@@ -349,7 +349,7 @@
       catch (DatabaseException dbe)
       {
       }
-      /* database is faulty : TODO : log better message */
+      /* database is faulty */
       int    msgID   = MSGID_CHANGELOG_SHUTDOWN_DATABASE_ERROR;
       String message = getMessage(msgID) + stackTraceToSingleLineString(e);
       logError(ErrorLogCategory.SYNCHRONIZATION,
@@ -553,7 +553,8 @@
            * to continue with the next record.
            * In such case, it is therefore possible that we miss some changes.
            * TODO. log an error message.
-           * TODO. Such problem should be handled by the repair functionality.
+           * TODO : REPAIR : Such problem should be handled by the
+           *        repair functionality.
            */
         }
       }

--
Gitblit v1.10.0