Fix issues 1966 and 1792.

matthew_swift

20.43.2007 2a52b482ba335b393356c00fac36d9ae597c8441

 opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestParentCfgDefn.java

@@ -164,8 +164,11 @@

  // Build the "test-children" relation definition.
  static {
    RD_TEST_CHILDREN = new InstantiableRelationDefinition<TestChildCfgClient, TestChildCfg>(
        INSTANCE, "multiple-children", "test-children", TestChildCfgDefn.getInstance(), null);
    InstantiableRelationDefinition.Builder<TestChildCfgClient, TestChildCfg> builder =
      new InstantiableRelationDefinition.Builder<TestChildCfgClient, TestChildCfg>(
        INSTANCE, "multiple-children", "test-children", TestChildCfgDefn
            .getInstance());
    RD_TEST_CHILDREN = builder.getInstance();
    INSTANCE.registerRelationDefinition(RD_TEST_CHILDREN);
  }

@@ -173,8 +176,10 @@

  // Build the "optional-test-child" relation definition.
  static {
    RD_OPTIONAL_TEST_CHILD = new OptionalRelationDefinition<TestChildCfgClient, TestChildCfg>(
    OptionalRelationDefinition.Builder<TestChildCfgClient, TestChildCfg> builder =
      new OptionalRelationDefinition.Builder<TestChildCfgClient, TestChildCfg>(
        INSTANCE, "optional-test-child", TestChildCfgDefn.getInstance());
    RD_OPTIONAL_TEST_CHILD = builder.getInstance();
    INSTANCE.registerRelationDefinition(RD_OPTIONAL_TEST_CHILD);
  }