root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

EmbeddedDatabaseFactory shuts down database when failing to populate it in initDatabase (SPR-7536) 

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3675 50f2f4bb-b051-0410-bef5-90022cba6387
This commit is contained in:
Juergen Hoeller 2010-09-10 09:07:20 +00:00
parent 61fac7d457
commit cfcff0249f
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2009 the original author or authors.
* Copyright 2002-2010 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -135,7 +135,14 @@ public class EmbeddedDatabaseFactory {
// Now populate the database
if (this.databasePopulator != null) {
populateDatabase();
try {
populateDatabase();
}
catch (RuntimeException ex) {
// failed to populate, so leave it as not initialized
shutdownDatabase();
throw ex;
}
}
}