Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
package org.hibernate.service.internal;

import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;

import org.hibernate.boot.spi.SessionFactoryOptions;
Expand All @@ -26,6 +27,16 @@ public class SessionFactoryServiceRegistryBuilderImpl implements SessionFactoryS

public SessionFactoryServiceRegistryBuilderImpl(ServiceRegistryImplementor parent) {
this.parent = parent;
if ( parent != null ) {
for ( Iterator<SessionFactoryServiceInitiator<?>> iterator = initiators.iterator(); iterator.hasNext(); ) {
final SessionFactoryServiceInitiator<?> initiator = iterator.next();
if ( parent.locateServiceBinding( initiator.getServiceInitiated() ) != null ) {
// Parent takes precedence over the standard service initiators
iterator.remove();
}
}

}
}

/**
Expand Down