svn merge -r5333:5417 https://opends.dev.java.net/svn/opends/branches/b2.0

matthew_swift

05.04.2009 9dc10dec2d5d7f61116f7f647b7cf9596ca77be0

 opendj-sdk/opends/src/server/org/opends/server/replication/server/ServerHandler.java

@@ -1875,7 +1875,7 @@
        {
          try
          {
            while (msgQueue.isEmpty())
            while (msgQueue.isEmpty() && (following == true))
            {
              msgQueue.wait(500);
              if (!activeWriter)
@@ -1885,15 +1885,18 @@
          {
            return null;
          }
          msg = msgQueue.removeFirst();
          if (this.updateServerState(msg))
          if (following == true)
          {
            /*
             * Only push the message if it has not yet been seen
             * by the other server.
             * Otherwise just loop to select the next message.
             */
            return msg;
            msg = msgQueue.removeFirst();
            if (this.updateServerState(msg))
            {
              /*
               * Only push the message if it has not yet been seen
               * by the other server.
               * Otherwise just loop to select the next message.
               */
              return msg;
            }
          }
        }
      }