Fix for 4192 Trailing replicated server process after stop - db must be shu...

pgamba

26.01.2009 ff5690487d72e787af916418ec550c2d0d815130

Fix for 4192 Trailing replicated server process after stop - db must be shutdowned before env

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

@@ -36,7 +36,6 @@
import org.opends.messages.MessageBuilder;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.replication.common.ChangeNumber;
import org.opends.server.types.DN;
import org.opends.server.types.DebugLogLevel;

import com.sleepycat.je.Cursor;
@@ -59,7 +58,6 @@
  private Database db = null;
  private ReplicationDbEnv dbenv = null;
  private ReplicationServer replicationServer;
  private DN baseDn;

  // The maximum number of retries in case of DatabaseDeadlock Exception.
  private static final int DEADLOCK_RETRIES = 10;
@@ -407,7 +405,7 @@
  @Override
  public String toString()
  {
    return "DraftCNDB:" + baseDn.toString();
    return "DraftCNDB";
  }

  /**
@@ -677,8 +675,8 @@
    }

    /**
     * a.
     * @return a.
     * Go to the next record on the cursor.
     * @return the next record on this cursor.
     * @throws DatabaseException a.
     */
    public boolean next() throws DatabaseException

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

@@ -737,12 +737,13 @@
      replicationServerDomain.shutdown();
    }

    shutdownECL();

    if (dbEnv != null)
    {
      dbEnv.shutdown();
    }

    shutdownECL();
}