opends/src/server/org/opends/server/replication/server/MessageHandler.java
@@ -252,7 +252,6 @@ { while (activeConsumer) { UpdateMsg msg; if (!following) { /* this server is late with regard to some other masters @@ -323,7 +322,7 @@ * queue, we can resume the processing from the regular queue * -> set following to true and empty the lateQueue. */ msg = lateQueue.first(); UpdateMsg msg = lateQueue.first(); synchronized (msgQueue) { if (msgQueue.contains(msg)) @@ -345,6 +344,7 @@ else { // get the next change from the lateQueue UpdateMsg msg; synchronized (msgQueue) { msg = lateQueue.removeFirst(); @@ -353,6 +353,8 @@ return msg; } } synchronized (msgQueue) { if (following) @@ -371,8 +373,7 @@ { return null; } msg = msgQueue.removeFirst(); UpdateMsg msg = msgQueue.removeFirst(); if (updateServerState(msg)) { /* opends/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
@@ -49,7 +49,6 @@ import org.opends.server.replication.server.changelog.api.ChangelogException; import org.opends.server.replication.server.changelog.api.ReplicationDBCursor; import org.opends.server.replication.server.changelog.je.DbHandler; import org.opends.server.replication.server.changelog.je.ReplicationDB; import org.opends.server.types.*; import static org.opends.messages.ReplicationMessages.*; @@ -1271,8 +1270,8 @@ * Identifier of the server for which the cursor is created. * @param startAfterCN * Starting point for the cursor. * @return the created {@link ReplicationDB}. Null when no DB is available or * the DB is empty for the provided serverId . * @return the created {@link ReplicationDBCursor}. Null when no DB is * available or the DB is empty for the provided serverId . */ public ReplicationDBCursor getCursorFrom(int serverId, ChangeNumber startAfterCN) opends/src/server/org/opends/server/replication/server/changelog/api/ReplicationDBCursor.java
opends/src/server/org/opends/server/replication/server/changelog/api/ReplicationDBCursorComparator.java
@@ -30,7 +30,6 @@ import java.util.Comparator; import org.opends.server.replication.common.ChangeNumber; import org.opends.server.replication.protocol.UpdateMsg; /** * This class defines a {@link Comparator} that allows to know which opends/src/server/org/opends/server/replication/server/changelog/je/DbHandler.java
@@ -44,7 +44,7 @@ import org.opends.server.replication.server.ReplicationServerDomain; import org.opends.server.replication.server.changelog.api.ChangelogException; import org.opends.server.replication.server.changelog.api.ReplicationDBCursor; import org.opends.server.replication.server.changelog.je.ReplicationDB.ReplServerDBCursor; import org.opends.server.replication.server.changelog.je.ReplicationDB.*; import org.opends.server.types.Attribute; import org.opends.server.types.Attributes; import org.opends.server.types.InitializationException; opends/src/server/org/opends/server/replication/server/changelog/je/JEReplicationDBCursor.java
@@ -32,7 +32,7 @@ import org.opends.server.replication.protocol.UpdateMsg; import org.opends.server.replication.server.changelog.api.ChangelogException; import org.opends.server.replication.server.changelog.api.ReplicationDBCursor; import org.opends.server.replication.server.changelog.je.ReplicationDB.ReplServerDBCursor; import org.opends.server.replication.server.changelog.je.ReplicationDB.*; /** * Berkeley DB JE implementation of {@link ReplicationDBCursor}.