Another mem-leak fix

This commit is contained in:
Brett Meyer 2013-04-02 22:08:42 -04:00
parent 9a4a760280
commit 56a907385e
2 changed files with 10 additions and 11 deletions

View File

@ -23,6 +23,8 @@
*/
package org.hibernate.cfg.beanvalidation;
import static junit.framework.Assert.assertEquals;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
@ -33,11 +35,6 @@ import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import org.hibernate.SessionFactory;
import org.hibernate.boot.registry.BootstrapServiceRegistry;
import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder;
@ -54,21 +51,22 @@ import org.hibernate.metamodel.spi.relational.Size;
import org.hibernate.metamodel.spi.relational.Value;
import org.hibernate.service.ServiceRegistry;
import org.hibernate.validator.constraints.Length;
import static junit.framework.Assert.assertEquals;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
/**
* @author Hardy Ferentschik
*/
public class ApplySchemaConstraintTest {
private StandardServiceRegistryImpl serviceRegistry;
private static StandardServiceRegistryImpl serviceRegistry;
@BeforeClass
public void setUp() {
public static void setUp() {
serviceRegistry = createServiceRegistry();
}
@AfterClass
public void tearDown(){
public static void tearDown(){
serviceRegistry.destroy();
serviceRegistry = null;
}
@ -172,7 +170,7 @@ public class ApplySchemaConstraintTest {
return ( org.hibernate.metamodel.spi.relational.Column ) value;
}
private StandardServiceRegistryImpl createServiceRegistry() {
private static StandardServiceRegistryImpl createServiceRegistry() {
final BootstrapServiceRegistryBuilder builder = new BootstrapServiceRegistryBuilder();
final BootstrapServiceRegistry bootstrapServiceRegistry = builder.build();
StandardServiceRegistryBuilder registryBuilder = new StandardServiceRegistryBuilder( bootstrapServiceRegistry );

View File

@ -334,6 +334,7 @@ public abstract class BaseCoreFunctionalTestCase extends BaseFunctionalTestCase
sessionFactory.close();
sessionFactory = null;
configuration = null;
metadata = null;
if(serviceRegistry == null){
return;
}