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

gbellato
16.20.2007 ed1a629a316f84a8a9f9d49680f9d2a11aea3034
use the admin framework facilities to do pattern matchin on the 
replication server addresses to make sure that it contain
both a hostname and a port number.

Also use the last : as the separator in case somebody would want to
use a IPv6 address.

Issu number 1579
3 files modified
23 ■■■■ changed files
opends/src/server/org/opends/server/replication/plugin/ReplicationBroker.java 6 ●●●● patch | view | raw | blame | history
opends/src/server/org/opends/server/replication/server/ReplicationServer.java 12 ●●●● patch | view | raw | blame | history
opends/src/server/org/opends/server/replication/server/ServerHandler.java 5 ●●●●● patch | view | raw | blame | history
opends/src/server/org/opends/server/replication/plugin/ReplicationBroker.java
@@ -203,9 +203,9 @@
    {
      for (String server : servers)
      {
        String token[] = server.split(":");
        String hostname = token[0];
        String port = token[1];
        int separator = server.lastIndexOf(':');
        String port = server.substring(separator + 1);
        String hostname = server.substring(0, separator);
        try
        {
opends/src/server/org/opends/server/replication/server/ReplicationServer.java
@@ -256,9 +256,9 @@
         */
        for (String serverURL : replicationServers)
        {
          String token[] = serverURL.split(":");
          String hostname = token[0];
          String port = token[1];
          int separator = serverURL.lastIndexOf(':');
          String port = serverURL.substring(separator + 1);
          String hostname = serverURL.substring(0, separator);
          try
          {
@@ -305,9 +305,9 @@
   */
  private void connect(String serverURL, DN baseDn)
  {
    String token[] = serverURL.split(":");
    String hostname = token[0];
    String port = token[1];
    int separator = serverURL.lastIndexOf(':');
    String port = serverURL.substring(separator + 1);
    String hostname = serverURL.substring(0, separator);
    try
    {
opends/src/server/org/opends/server/replication/server/ServerHandler.java
@@ -241,8 +241,9 @@
        ReplServerStartMessage receivedMsg = (ReplServerStartMessage) msg;
        serverId = receivedMsg.getServerId();
        serverURL = receivedMsg.getServerURL();
        String[] splittedURL = serverURL.split(":");
        serverAddressURL = session.getRemoteAddress() + ":" + splittedURL[1];
        int separator = serverURL.lastIndexOf(':');
        serverAddressURL =
          session.getRemoteAddress() + ":" + serverURL.substring(separator + 1);
        serverIsLDAPserver = false;
        this.baseDn = receivedMsg.getBaseDn();
        if (baseDn == null)