Fix issue OpenDJ-103: Replication in 2.4 head and trunk are no longer compa...

Matthew Swift

31.36.2011 04689d9435472afbb67350d30adbb292945c2187

Fix issue OpenDJ-103: Replication in 2.4 head and trunk are no longer compatible with 2.4.0 and 2.4.1

 opends/src/server/org/opends/server/replication/protocol/TLSSocketSession.java

@@ -405,6 +405,11 @@
      setSessionError(e);
      throw e;
    }
    catch (final RuntimeException e)
    {
      setSessionError(e);
      throw e;
    }
  }


@@ -438,14 +443,18 @@
  public void stopEncryption()
  {
    // The secure socket has been configured not to auto close the underlying
    // plain socket.
    try
    // plain socket. We should close it here and properly tear down the SSL
    // session, but this is not compatible with the existing protocol.
    if (false)
    {
      secureSocket.close();
    }
    catch (IOException ignored)
    {
      // Ignore.
      try
      {
        secureSocket.close();
      }
      catch (IOException ignored)
      {
        // Ignore.
      }
    }

    input = plainInput;

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

@@ -533,7 +533,6 @@
          Integer.toString(inServerStartMsg.getServerId()),
          Integer.toString(replicationServerDomain.getReplicationServer().
          getServerId()));
        logError(errMessage);
        throw new DirectoryException(ResultCode.OTHER, errMessage);
      }
      catch (NotSupportedOldVersionPDUException e)

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

@@ -431,7 +431,6 @@
        Integer.toString(inReplServerStartMsg.getServerId()),
        Integer.toString(replicationServerDomain.getReplicationServer().
        getServerId()));
      logError(errMessage);
      abortStart(errMessage);
    }
    catch(DirectoryException de)