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

Jean-Noel Rouvignac
20.57.2013 af9d34fcd7cd501885e003e19e9e4a66411cbbfb
Fixed continuous integration tests failure with FractionalReplicationTest.

ReplicationBroker.java:
Reinstated previous code behaviour (somewhat unclear) where the session can directly be used right after performPhaseTwoHandshake() succeeds.
1 files modified
9 ■■■■■ changed files
opends/src/server/org/opends/server/replication/service/ReplicationBroker.java 9 ●●●●● patch | view | raw | blame | history
opends/src/server/org/opends/server/replication/service/ReplicationBroker.java
@@ -81,6 +81,7 @@
    /** The info of the RS we are connected to. */
    private final ReplicationServerInfo rsInfo;
    /** Contains a connected session to the RS if any exist, null otherwise. */
    private final Session session;
    private final String replicationServer;
@@ -982,7 +983,7 @@
    final DN baseDN = getBaseDN();
    final ReplicationServerInfo rsInfo = rs.rsInfo;
    boolean connectSuccessful = false;
    boolean connectCompleted = false;
    try
    {
      maxSendWindow = rsInfo.getWindowSize();
@@ -1042,8 +1043,7 @@
      {
        startChangeTimeHeartBeatPublishing(rs);
      }
      setConnectedRS(rs);
      connectSuccessful = true;
      connectCompleted = true;
    }
    catch (Exception e)
    {
@@ -1053,7 +1053,7 @@
    }
    finally
    {
      if (!connectSuccessful)
      if (!connectCompleted)
      {
        setConnectedRS(ConnectedRS.noConnectedRS());
      }
@@ -1349,6 +1349,7 @@
      // Alright set the timeout to the desired value
      session.setSoTimeout(timeout);
      setConnectedRS(electedRS);
      return topologyMsg;
    }
    catch (Exception e)