Skip to content
This repository was archived by the owner on Oct 26, 2022. It is now read-only.

JPA-62 Fix #5

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

JPA-62 Fix #5

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8410eb0
JPA-62: Consistent provider iteration order
jrtc27 Mar 16, 2014
99e02f5
JPA-62: Prioritize Hibernate providers in the order they appear
jrtc27 Mar 16, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions src/main/java/javax/persistence/spi/PersistenceProviderResolverHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import java.net.URL;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import java.util.WeakHashMap;
Expand Down Expand Up @@ -126,7 +126,7 @@ private void loadResolverClasses(ClassLoader cl) {
synchronized ( resolverClasses ) {
try {
Enumeration<URL> resources = cl.getResources( "META-INF/services/" + PersistenceProvider.class.getName() );
Set<String> names = new HashSet<String>();
Set<String> names = new LinkedHashSet<String>();
while ( resources.hasMoreElements() ) {
URL url = resources.nextElement();
InputStream is = url.openStream();
Expand All @@ -137,21 +137,20 @@ private void loadResolverClasses(ClassLoader cl) {
is.close();
}
}
List<WeakReference<Class<? extends PersistenceProvider>>> nonHibernateClasses = new ArrayList<WeakReference<Class<? extends PersistenceProvider>>>();
for ( String s : names ) {
@SuppressWarnings( "unchecked" )
Class<? extends PersistenceProvider> providerClass = (Class<? extends PersistenceProvider>) cl.loadClass( s );
WeakReference<Class<? extends PersistenceProvider>> reference
= new WeakReference<Class<? extends PersistenceProvider>>(providerClass);
//keep Hibernate atop
if ( s.endsWith( "HibernatePersistence" ) && resolverClasses.size() > 0 ) {
WeakReference<Class<? extends PersistenceProvider>> movedReference = resolverClasses.get( 0 );
resolverClasses.add( 0, reference );
resolverClasses.add( movedReference );
}
else {
if ( s.startsWith("org.hibernate") ) {
resolverClasses.add( reference );
} else {
nonHibernateClasses.add( reference );
}
}
resolverClasses.addAll( nonHibernateClasses );
}
catch ( IOException e ) {
throw new PersistenceException( e );
Expand Down Expand Up @@ -201,7 +200,7 @@ public synchronized void clearCachedProviders() {
private static final Pattern nonCommentPattern = Pattern.compile( "^([^#]+)" );

private static Set<String> providerNamesFromReader(BufferedReader reader) throws IOException {
Set<String> names = new HashSet<String>();
Set<String> names = new LinkedHashSet<String>();
String line;
while ( ( line = reader.readLine() ) != null ) {
line = line.trim();
Expand Down