zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-07-12 14:08:18 +02:00
Code Issues Projects Releases Packages Wiki Activity

Consolidate EntityManagerFactoryProviderTest (#253)

Browse source 
Check if EntityManagerFactory is null before calling close() to avoid NullPointerException.
This commit is contained in:
Shicong Huang 2019-09-04 15:46:13 -04:00 • committed by GitHub
parent 28700cd610
commit 2967256766
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/src/main/java/google/registry/persistence/EntityManagerFactoryProvider.java
View file

@ -14,6 +14,7 @@
package google.registry.persistence; package google.registry.persistence;
import static com.google.common.base.Preconditions.checkState;
import static google.registry.config.RegistryConfig.getHibernateConnectionIsolation; import static google.registry.config.RegistryConfig.getHibernateConnectionIsolation;
import static google.registry.config.RegistryConfig.getHibernateHikariConnectionTimeout; import static google.registry.config.RegistryConfig.getHibernateHikariConnectionTimeout;
import static google.registry.config.RegistryConfig.getHibernateHikariIdleTimeout; import static google.registry.config.RegistryConfig.getHibernateHikariIdleTimeout;
@ -62,6 +63,11 @@ public class EntityManagerFactoryProvider {
properties.put(Environment.URL, jdbcUrl); properties.put(Environment.URL, jdbcUrl);
properties.put(Environment.USER, username); properties.put(Environment.USER, username);
properties.put(Environment.PASS, password); properties.put(Environment.PASS, password);
return Persistence.createEntityManagerFactory(PERSISTENCE_UNIT_NAME, properties.build()); EntityManagerFactory emf =
Persistence.createEntityManagerFactory(PERSISTENCE_UNIT_NAME, properties.build());
checkState(
emf != null,
"Persistence.createEntityManagerFactory() returns a null EntityManagerFactory");
return emf;
} }
} }

2
core/src/test/java/google/registry/persistence/EntityManagerFactoryProviderTest.java
View file

@ -42,7 +42,9 @@ public class EntityManagerFactoryProviderTest {
@After @After
public void destroy() { public void destroy() {
if (emf != null) {
emf.close(); emf.close();
}
emf = null; emf = null;
} }