Increased encapsulation in ReplicationServerDomain by: - Making private the...

Jean-Noel Rouvignac

21.33.2013 10b76e3a58346e0b6e2e07e58617b75dc383c249

 opends/src/server/org/opends/server/replication/server/ReplicationServer.java

@@ -336,21 +336,21 @@

        if (msg instanceof ServerStartMsg)
        {
          DataServerHandler handler = new DataServerHandler(
          DataServerHandler dsHandler = new DataServerHandler(
              session, queueSize, this, rcvWindow);
          handler.startFromRemoteDS((ServerStartMsg)msg);
          dsHandler.startFromRemoteDS((ServerStartMsg) msg);
        }
        else if (msg instanceof ReplServerStartMsg)
        {
          ReplicationServerHandler handler = new ReplicationServerHandler(
          ReplicationServerHandler rsHandler = new ReplicationServerHandler(
              session, queueSize, this, rcvWindow);
          handler.startFromRemoteRS((ReplServerStartMsg)msg);
          rsHandler.startFromRemoteRS((ReplServerStartMsg) msg);
        }
        else if (msg instanceof ServerStartECLMsg)
        {
          ECLServerHandler handler = new ECLServerHandler(
          ECLServerHandler eclHandler = new ECLServerHandler(
              session, queueSize, this, rcvWindow);
          handler.startFromRemoteServer((ServerStartECLMsg)msg);
          eclHandler.startFromRemoteServer((ServerStartECLMsg) msg);
        }
        else
        {
@@ -471,9 +471,9 @@
  private Set<String> getConnectedRSUrls(ReplicationServerDomain domain)
  {
    Set<String> results = new LinkedHashSet<String>();
    for (ReplicationServerHandler handler : domain.getConnectedRSs().values())
    for (ReplicationServerHandler rsHandler : domain.getConnectedRSs().values())
    {
      results.add(normalizeServerURL(handler.getServerAddressURL()));
      results.add(normalizeServerURL(rsHandler.getServerAddressURL()));
    }
    return results;
  }
@@ -507,9 +507,9 @@
      socket.connect(ServerAddr, timeoutMS);
      session = replSessionSecurity.createClientSession(socket, timeoutMS);

      ReplicationServerHandler handler = new ReplicationServerHandler(
      ReplicationServerHandler rsHandler = new ReplicationServerHandler(
          session, queueSize, this, rcvWindow);
      handler.connect(baseDn, sslEncryption);
      rsHandler.connect(baseDn, sslEncryption);
    }
    catch (Exception e)
    {
@@ -867,19 +867,22 @@


  /**
   * Creates a new DB handler for this ReplicationServer and the serverId and
   * DN given in parameter.
   * Creates a new DB handler for this ReplicationServer and the serverId and DN
   * given in parameter.
   *
   * @param id The serverId for which the dbHandler must be created.
   * @param baseDn The DN for which the dbHandler must be created.
   * @param serverId
   *          The serverId for which the dbHandler must be created.
   * @param baseDn
   *          The DN for which the dbHandler must be created.
   * @return The new DB handler for this ReplicationServer and the serverId and
   *         DN given in parameter.
   * @throws ChangelogException in case of underlying database problem.
   * @throws ChangelogException
   *           in case of underlying database problem.
   */
  public DbHandler newDbHandler(int id, String baseDn)
  public DbHandler newDbHandler(int serverId, String baseDn)
      throws ChangelogException
  {
    return new DbHandler(id, baseDn, this, dbEnv, queueSize);
    return new DbHandler(serverId, baseDn, this, dbEnv, queueSize);
  }


@@ -1139,8 +1142,7 @@
  {
    for (ReplicationServerDomain domain : getReplicationServerDomains())
    {
      domain.buildAndSendTopoInfoToDSs(null);
      domain.buildAndSendTopoInfoToRSs();
      domain.sendTopoInfoToAll();
    }
  }