From e712a44ec3e5a9ccb1c687ffaaff5c7c3a37e058 Mon Sep 17 00:00:00 2001
From: Brett Meyer <brett@3riverdev.com>
Date: Fri, 7 Feb 2014 10:07:31 -0500
Subject: [PATCH] HHH-8922 ClassLoaderServiceImpl#getResources should use
 LinkedHashSet to preserve ordering

Conflicts:
	hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/ClassLoaderServiceImpl.java
---
 .../classloading/internal/ClassLoaderServiceImpl.java       | 3 +--
 .../src/main/java/org/hibernate/osgi/OsgiClassLoader.java   | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/hibernate-core/src/main/java/org/hibernate/service/classloading/internal/ClassLoaderServiceImpl.java b/hibernate-core/src/main/java/org/hibernate/service/classloading/internal/ClassLoaderServiceImpl.java
index 90b06c6f8f..b35dc0b1fc 100644
--- a/hibernate-core/src/main/java/org/hibernate/service/classloading/internal/ClassLoaderServiceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/service/classloading/internal/ClassLoaderServiceImpl.java
@@ -31,7 +31,6 @@
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -272,7 +271,7 @@ private AggregatedClassLoader(final LinkedHashSet<ClassLoader> orderedClassLoade
 
 		@Override
 		public Enumeration<URL> getResources(String name) throws IOException {
-			final HashSet<URL> resourceUrls = new HashSet<URL>();
+			final LinkedHashSet<URL> resourceUrls = new LinkedHashSet<URL>();
 
 			for ( ClassLoader classLoader : individualClassLoaders ) {
 				final Enumeration<URL> urls = classLoader.getResources( name );
diff --git a/hibernate-osgi/src/main/java/org/hibernate/osgi/OsgiClassLoader.java b/hibernate-osgi/src/main/java/org/hibernate/osgi/OsgiClassLoader.java
index 7a090db958..e1dc63f075 100644
--- a/hibernate-osgi/src/main/java/org/hibernate/osgi/OsgiClassLoader.java
+++ b/hibernate-osgi/src/main/java/org/hibernate/osgi/OsgiClassLoader.java
@@ -27,7 +27,7 @@
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.HashMap;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
@@ -45,8 +45,8 @@
 public class OsgiClassLoader extends ClassLoader {
 	// Leave these as Sets -- addClassLoader or addBundle may be called more
 	// than once if a SF or EMF is closed and re-created.
-	private Set<ClassLoader> classLoaders = new HashSet<ClassLoader>();
-	private Set<Bundle> bundles = new HashSet<Bundle>();
+	private Set<ClassLoader> classLoaders = new LinkedHashSet<ClassLoader>();
+	private Set<Bundle> bundles = new LinkedHashSet<Bundle>();
 
 	private Map<String, Class<?>> classCache = new HashMap<String, Class<?>>();