From cfcff0249f0e20a7b1f47037ad9ca4704b3e1113 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Fri, 10 Sep 2010 09:07:20 +0000 Subject: [PATCH] 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 --- .../datasource/embedded/EmbeddedDatabaseFactory.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java index 1daf03e076e..cc806c92a07 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java @@ -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; + } } }