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

davidely
02.28.2007 dd05db4406802095ee6ff0f759985492aec1d1e3
Make UpdateOperationTest do a in-core restart before running tests like the other replication tests.  Fixed an NPE in ServerHandler that occurred in one run of the unit tests
2 files modified
40 ■■■■ changed files
opends/src/server/org/opends/server/replication/server/ServerHandler.java 34 ●●●●● patch | view | raw | blame | history
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java 6 ●●●● patch | view | raw | blame | history
opends/src/server/org/opends/server/replication/server/ServerHandler.java
@@ -24,6 +24,32 @@
 *
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
/*
 * CDDL HEADER START
 *
 * The contents of this file are subject to the terms of the
 * Common Development and Distribution License, Version 1.0 only
 * (the "License").  You may not use this file except in compliance
 * with the License.
 *
 * You can obtain a copy of the license at
 * trunk/opends/resource/legal-notices/OpenDS.LICENSE
 * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
 * See the License for the specific language governing permissions
 * and limitations under the License.
 *
 * When distributing Covered Code, include this CDDL HEADER in each
 * file and include the License file at
 * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
 * add the following below this CDDL HEADER, with the fields enclosed
 * by brackets "[]" replaced with your own identifying information:
 *      Portions Copyright [yyyy] [name of copyright owner]
 *
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.replication.server;
import org.opends.messages.MessageBuilder;
@@ -1257,8 +1283,12 @@
    try
    {
      writer.join(SHUTDOWN_JOIN_TIMEOUT);
      reader.join(SHUTDOWN_JOIN_TIMEOUT);
      if (writer != null) {
        writer.join(SHUTDOWN_JOIN_TIMEOUT);
      }
      if (reader != null) {
        reader.join(SHUTDOWN_JOIN_TIMEOUT);
      }
    } catch (InterruptedException e)
    {
      // don't try anymore to join and return.
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java
@@ -131,11 +131,7 @@
  @Override
  public void setUp() throws Exception
  {
    // This test suite depends on having the schema available.
    TestCaseUtils.startServer();
    // Create an internal connection
    connection = InternalClientConnection.getRootConnection();
    super.setUp();
    // Create backend top level entries
    String[] topEntries = new String[2];