EmbeddedDatabaseFactory shuts down database when failing to populate it in initDatabase (SPR-7536)
This commit is contained in:
parent
609f91e1b4
commit
c2dab9c200
|
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue