Browse Source

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

pull/1234/head
Juergen Hoeller 15 years ago
parent
commit
c2dab9c200
  1. 11
      org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java

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

@ -1,5 +1,5 @@ @@ -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 { @@ -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;
}
}
}

Loading…
Cancel
Save