From 080b8a0085c873936fe375f80faf51bef3af3046 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 12 Nov 2014 11:04:52 +0000
Subject: [PATCH] Fix JDK8 build break: ensure that collation matching rules have a predictable primary name

---
 opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchemaImpl.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchemaImpl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchemaImpl.java
index fd9a040..4a12f2f 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchemaImpl.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchemaImpl.java
@@ -41,6 +41,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.TreeMap;
 
 final class CoreSchemaImpl {
     private static final Map<String, List<String>> X500_ORIGIN = Collections.singletonMap(
@@ -891,7 +892,7 @@
      */
     private static void addCollationMatchingRules(final SchemaBuilder builder) {
         // Build an intermediate map to ensure each locale name appears only once
-        final Map<String, Locale> localesCache = new HashMap<String, Locale>();
+        final Map<String, Locale> localesCache = new TreeMap<String, Locale>();
         for (Locale locale : Locale.getAvailableLocales()) {
             localesCache.put(localeName(locale), locale);
         }

--
Gitblit v1.10.0