mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Matthew Swift
05.47.2013 438badef09118fa14b80f32fef7f0d0c1302d27c
Minor code cleanup.
1 files modified
21 ■■■■ changed files
opendj-sdk/opends/src/server/org/opends/server/replication/server/MsgQueue.java 21 ●●●● patch | view | raw | blame | history
opendj-sdk/opends/src/server/org/opends/server/replication/server/MsgQueue.java
@@ -23,7 +23,7 @@
 *
 *
 *      Copyright 2006-2010 Sun Microsystems, Inc.
 *      Portions copyright 2012 ForgeRock AS.
 *      Portions copyright 2012-2013 ForgeRock AS.
 */
package org.opends.server.replication.server;
@@ -116,27 +116,18 @@
      UpdateMsg msgSameChangeNumber = map.put(update.getChangeNumber(), update);
      if (msgSameChangeNumber != null)
      {
        boolean sameMsgs = false;
        try
        {
          if (
            (msgSameChangeNumber.getBytes().length == update.getBytes().length)
            && (msgSameChangeNumber.isAssured() == update.isAssured())
            && (msgSameChangeNumber.getVersion() == update.getVersion()) )
            {
              sameMsgs = true;
            }
            if (!sameMsgs)
          if (msgSameChangeNumber.getBytes().length != update.getBytes().length
              || msgSameChangeNumber.isAssured() != update.isAssured()
              || msgSameChangeNumber.getVersion() != update.getVersion())
            {
              // Adding 2 msgs with the same ChangeNumber is ok only when
              // the 2 masgs are the same
            // the 2 msgs are the same
              bytesCount += (update.size() - msgSameChangeNumber.size());
              Message errMsg = ERR_RSQUEUE_DIFFERENT_MSGS_WITH_SAME_CN.get(
                  msgSameChangeNumber.getChangeNumber().toString(),
                  msgSameChangeNumber.toString(),
                  update.toString());
                msgSameChangeNumber.toString(), update.toString());
              logError(errMsg);
            }
        }