From 312bda534f93c12c055972487fb584a88c10b2eb Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 9 Jun 2011 23:15:27 +0000 Subject: [PATCH] avoid Logger.getGlobal() - it's Java 7 only... git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4511 50f2f4bb-b051-0410-bef5-90022cba6387 --- .../org/springframework/jdbc/datasource/AbstractDataSource.java | 2 +- .../springframework/jdbc/datasource/DelegatingDataSource.java | 2 +- .../jdbc/datasource/embedded/EmbeddedDatabaseFactory.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/AbstractDataSource.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/AbstractDataSource.java index 7ccf2821aa3..89ebe1218c2 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/AbstractDataSource.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/AbstractDataSource.java @@ -97,7 +97,7 @@ public abstract class AbstractDataSource implements DataSource { //--------------------------------------------------------------------- public Logger getParentLogger() { - return Logger.getGlobal(); + return Logger.getLogger(Logger.GLOBAL_LOGGER_NAME); } } diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/DelegatingDataSource.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/DelegatingDataSource.java index 8d65aa765b4..5d6a21a33ac 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/DelegatingDataSource.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/DelegatingDataSource.java @@ -124,7 +124,7 @@ public class DelegatingDataSource implements DataSource, InitializingBean { //--------------------------------------------------------------------- public Logger getParentLogger() { - return Logger.getGlobal(); + return Logger.getLogger(Logger.GLOBAL_LOGGER_NAME); } } 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 724716f61de..2dd44185280 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 @@ -229,7 +229,7 @@ public class EmbeddedDatabaseFactory { } public Logger getParentLogger() { - return Logger.getGlobal(); + return Logger.getLogger(Logger.GLOBAL_LOGGER_NAME); } public void shutdown() {