From 754b6fe22c8138460bd93f2b0c9d725c627163c4 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 29 Oct 2014 16:33:54 +0000
Subject: [PATCH] OPENDJ-1571 Internal Error when doing REST operations on HTTP Connection Handler

---
 opends/tests/unit-tests-testng/src/server/org/opends/server/backends/ChangelogBackendTestCase.java |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/ChangelogBackendTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/ChangelogBackendTestCase.java
index 99b82c2..b371e88 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/ChangelogBackendTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/ChangelogBackendTestCase.java
@@ -146,7 +146,7 @@
    * When used in a search operation, it includes all attributes (user and
    * operational)
    */
-  private static final Set<String> ALL_ATTRIBUTES = newSet("*", "+");
+  private static final LinkedHashSet<String> ALL_ATTRIBUTES = newLinkedHashSet("*", "+");
   private static final List<Control> NO_CONTROL = null;
 
   @BeforeClass
@@ -776,8 +776,8 @@
     String testName = "attributesVisibleOutsideRootDSE";
     debugInfo(testName, "Starting test \n\n");
 
-    Set<String> attributes =
-        newSet("firstchangenumber", "lastchangenumber", "changelog", "lastExternalChangelogCookie");
+    LinkedHashSet<String> attributes =
+        newLinkedHashSet("firstchangenumber", "lastchangenumber", "changelog", "lastExternalChangelogCookie");
 
     InternalSearchOperation searchOp = searchDNWithBaseScope(TEST_ROOT_DN_STRING, attributes);
     waitForSearchOpResult(searchOp, ResultCode.SUCCESS);
@@ -849,7 +849,7 @@
     {
       try
       {
-        final Set<String> attributes = new LinkedHashSet<String>();
+        final LinkedHashSet<String> attributes = new LinkedHashSet<String>();
         if (expectedFirstChangeNumber > 0)
         {
           attributes.add("firstchangenumber");
@@ -900,7 +900,7 @@
     String cookie = "";
     LDIFWriter ldifWriter = getLDIFWriter();
 
-    InternalSearchOperation searchOp = searchDNWithBaseScope("", newSet("lastExternalChangelogCookie"));
+    InternalSearchOperation searchOp = searchDNWithBaseScope("", newLinkedHashSet("lastExternalChangelogCookie"));
     List<SearchResultEntry> entries = searchOp.getSearchEntries();
     if (entries != null)
     {
@@ -1108,7 +1108,7 @@
     return searchChangelog(filterString, ALL_ATTRIBUTES, NO_CONTROL, expectedNbEntries, expectedResultCode, testName);
   }
 
-  private InternalSearchOperation searchChangelog(String filterString, Set<String> attributes,
+  private InternalSearchOperation searchChangelog(String filterString, LinkedHashSet<String> attributes,
       List<Control> controls, int expectedNbEntries, ResultCode expectedResultCode, String testName) throws Exception
   {
     InternalSearchOperation searchOperation = null;
@@ -1134,7 +1134,7 @@
     return searchOperation;
   }
 
-  private InternalSearchOperation searchDNWithBaseScope(String dn, Set<String> attributes) throws Exception
+  private InternalSearchOperation searchDNWithBaseScope(String dn, LinkedHashSet<String> attributes) throws Exception
   {
     final InternalSearchOperation searchOp = connection.processSearch(
         dn,

--
Gitblit v1.10.0