ChangeNumber.java: In the ctor, renamed parameters. In other methods, used ...

Jean-Noel Rouvignac

14.15.2013 a6066d4cb97b233d7465d01ca4b2a6c0057dc07c

ChangeNumber.java:
In the ctor, renamed parameters.
In other methods, used early exit.

 opends/src/server/org/opends/server/replication/common/ChangeNumber.java

@@ -115,15 +115,15 @@
  /**
   * Create a new ChangeNumber.
   *
   * @param time time for the ChangeNumber
   * @param seq sequence number
   * @param serverId2 identity of server
   * @param timeStamp timeStamp for the ChangeNumber
   * @param seqNum sequence number
   * @param serverId identity of server
   */
  public ChangeNumber(long time, int seq, int serverId2)
  public ChangeNumber(long timeStamp, int seqNum, int serverId)
  {
    serverId = serverId2;
    timeStamp = time;
    seqnum = seq;
    this.serverId = serverId;
    this.timeStamp = timeStamp;
    this.seqnum = seqNum;
  }

  /**
@@ -176,8 +176,7 @@
          this.serverId == cn.serverId &&
          this.timeStamp == cn.timeStamp;
    }
    else
      return false;
    return false;
  }

  /**
@@ -263,8 +262,7 @@
    {
      if (CN2 == null)
        return 0;
      else
        return -1;
      return -1;
    }
    else if (CN2 == null)
      return 1;
@@ -327,14 +325,10 @@
      if (seqnum2 <= seqnum1)
      {
        return seqnum1 - seqnum2;
      } else
      {
        return Integer.MAX_VALUE - (seqnum2 - seqnum1) + 1;
      }
    } else
    {
      return 0;
      return Integer.MAX_VALUE - (seqnum2 - seqnum1) + 1;
    }
    return 0;
  }

  /**