From 1503a139e2ccb34c38bd4f3c506ffabea037881f Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Tue, 10 Aug 2010 22:36:36 +0000
Subject: [PATCH] fixed yet another regression with respect to newlines
 (SPR-7449)

---
 .../jdbc/datasource/init/ResourceDatabasePopulator.java         | 2 +-
 .../jdbc/datasource/init/DatabasePopulatorTests.java            | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/init/ResourceDatabasePopulator.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/init/ResourceDatabasePopulator.java
index 327df634e2..0404963d3e 100644
--- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/init/ResourceDatabasePopulator.java
+++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/init/ResourceDatabasePopulator.java
@@ -263,7 +263,7 @@ public class ResourceDatabasePopulator implements DatabasePopulator {
 					continue;
 				}
 				else if (c == '\n' || c == '\t') {
-					continue;
+					c = ' ';
 				}
 			}
 			sb.append(c);
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/init/DatabasePopulatorTests.java b/org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/init/DatabasePopulatorTests.java
index 1552f4945b..90113f952f 100644
--- a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/init/DatabasePopulatorTests.java
+++ b/org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/init/DatabasePopulatorTests.java
@@ -71,7 +71,6 @@ public class DatabasePopulatorTests {
 		assertTestDatabaseCreated();
 	}
 
-	@Ignore("Disabled until SPR-7449 is resolved")
 	@Test
 	public void scriptWithEolBetweenTokens() throws Exception {
 		databasePopulator.addScript(resourceLoader.getResource("users-schema.sql"));