Another fix for OpenDJ-97: Very many minor problems with the error logging ...

Matthew Swift

14.24.2011 fdd4869955da5a5f181d0d44756d3da0bdd35594

Another fix for OpenDJ-97: Very many minor problems with the error logging for replication

 opends/src/messages/messages/replication.properties

@@ -538,4 +538,6 @@
 application connecting to this replication server. The error was: %s
SEVERE_WARN_MISSING_REMOTE_MONITOR_DATA_106=Timed out waiting for monitor data \
 for the domain "%s" from replication server RS(%d)

NOTICE_LOAD_BALANCE_REPLICATION_SERVER_213=Directory Server DS(%d) is disconnecting \
 from replication server RS(%d) at %s for domain "%s" in order to find another \
 replication server in the topology and distribute load more equally

 opends/src/server/org/opends/server/replication/service/ReplicationBroker.java

@@ -2601,15 +2601,21 @@
              {
                // The best replication server is no more the one we are
                // currently using. Disconnect properly then reconnect.
                int bestServerId = -1;
                if (bestServerInfo != null)
                Message message;
                if (bestServerInfo == null)
                {
                  bestServerId = bestServerInfo.getServerId();
                }
                Message message = NOTE_NEW_BEST_REPLICATION_SERVER
                    .get(serverId, replicationServerID,
                  message = NOTE_LOAD_BALANCE_REPLICATION_SERVER.get(
                      serverId, replicationServerID,
                        failingSession.getReadableRemoteAddress(),
                        bestServerId, baseDn);
                      baseDn);
                }
                else
                {
                  message = NOTE_NEW_BEST_REPLICATION_SERVER.get(
                      serverId, replicationServerID,
                      failingSession.getReadableRemoteAddress(),
                      bestServerInfo.getServerId(), baseDn);
                }
                logError(message);
                reStart(true);
              }