HHH-19633 Don't override parent provided service with default service

Author: beikov

hibernate-core/src/main/java/org/hibernate/service/internal/SessionFactoryServiceRegistryBuilderImpl.java

@@ -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;
@@ -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();
+				}
+			}
+
+		}
 	}
 
 	/**