Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-13209 Allow for re-starting of a deactivated ServiceRegistry instance

This commit is contained in:
Sanne Grinovero 2018-08-14 21:50:30 +01:00 committed by Guillaume Smet
parent 5fe874f7cf
commit bc6be66c66
2 changed files with 62 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
hibernate-core/src/main/java/org/hibernate/boot/registry/internal/StandardServiceRegistryImpl.java
View File

@ -6,6 +6,7 @@
*/
package org.hibernate.boot.registry.internal;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -25,7 +26,9 @@ import org.hibernate.service.spi.ServiceInitiator;
* @author Steve Ebersole
*/
public class StandardServiceRegistryImpl extends AbstractServiceRegistryImpl implements StandardServiceRegistry {
private final Map configurationValues;
//Access to this field requires synchronization on -this-
private Map configurationValues;
/**
* Constructs a StandardServiceRegistryImpl. Should not be instantiated directly; use
@ -71,6 +74,10 @@ public class StandardServiceRegistryImpl extends AbstractServiceRegistryImpl imp
this.configurationValues = configurationValues;
applyServiceRegistrations( serviceInitiators, providedServices );
}
private void applyServiceRegistrations(List<StandardServiceInitiator> serviceInitiators, List<ProvidedService> providedServices) {
try {
// process initiators
for ( ServiceInitiator initiator : serviceInitiators ) {
@ -89,15 +96,37 @@ public class StandardServiceRegistryImpl extends AbstractServiceRegistryImpl imp
}
@Override
public <R extends Service> R initiateService(ServiceInitiator<R> serviceInitiator) {
public synchronized <R extends Service> R initiateService(ServiceInitiator<R> serviceInitiator) {
// todo : add check/error for unexpected initiator types?
return ( (StandardServiceInitiator<R>) serviceInitiator ).initiateService( configurationValues, this );
}
@Override
public <R extends Service> void configureService(ServiceBinding<R> serviceBinding) {
public synchronized <R extends Service> void configureService(ServiceBinding<R> serviceBinding) {
if ( Configurable.class.isInstance( serviceBinding.getService() ) ) {
( (Configurable) serviceBinding.getService() ).configure( configurationValues );
}
}
/**
* Very advanced and tricky to handle: not designed for this. Intended for experiments only!
*/
public synchronized void resetAndReactivate(BootstrapServiceRegistry bootstrapServiceRegistry,
List<StandardServiceInitiator> serviceInitiators,
List<ProvidedService> providedServices,
Map<?, ?> configurationValues) {
if ( super.isActive() ) {
throw new IllegalStateException( "Can't reactivate an active registry!" );
}
super.resetParent( bootstrapServiceRegistry );
this.configurationValues = new HashMap( configurationValues );
super.reactivate();
applyServiceRegistrations( serviceInitiators, providedServices );
}
@Override
public synchronized void destroy() {
super.destroy();
this.configurationValues = null;
}
}

31
hibernate-core/src/main/java/org/hibernate/service/internal/AbstractServiceRegistryImpl.java
View File

@ -49,7 +49,7 @@ public abstract class AbstractServiceRegistryImpl
public static final String ALLOW_CRAWLING = "hibernate.service.allow_crawling";
private final ServiceRegistryImplementor parent;
private volatile ServiceRegistryImplementor parent;
private final boolean allowCrawling;
private final ConcurrentMap<Class,ServiceBinding> serviceBindingMap = new ConcurrentHashMap<>();
@ -429,4 +429,33 @@ public abstract class AbstractServiceRegistryImpl
}
}
}
/**
* Very advanced and tricky to handle: not designed for this. Intended for experiments only!
*/
public void resetParent(BootstrapServiceRegistry newParent) {
if ( this.parent != null ) {
this.parent.deRegisterChild( this );
}
if ( newParent != null ) {
if ( ! ServiceRegistryImplementor.class.isInstance( newParent ) ) {
throw new IllegalArgumentException( "ServiceRegistry parent needs to implement ServiceRegistryImplementor" );
}
this.parent = (ServiceRegistryImplementor) newParent;
this.parent.registerChild( this );
}
else {
this.parent = null;
}
}
public synchronized void reactivate() {
if ( active.compareAndSet( false, true ) ) {
//ok
}
else {
throw new IllegalStateException( "Was not inactive, could not reactivate!" );
}
}
}