Merge branch '2.1.x' into 2.2.x

Closes gh-19682

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/PoolingDataSourceBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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.
@@ -107,13 +107,16 @@ public class PoolingDataSourceBean extends PoolingDataSource implements BeanName
 
 	@Override
 	public Logger getParentLogger() throws SQLFeatureNotSupportedException {
-		try {
+		XADataSource dataSource = this.dataSource;
-			return this.getParentLogger();
+		if (dataSource != null) {
-		}
+			try {
-		catch (Exception ex) {
+				return dataSource.getParentLogger();
-			// Work around https://jira.codehaus.org/browse/BTM-134
+			}
-			return Logger.getLogger(Logger.GLOBAL_LOGGER_NAME);
+			catch (Exception ex) {
+				// Swallow and continue
+			}
 		}
+		return Logger.getLogger(Logger.GLOBAL_LOGGER_NAME);
 	}
 
 	/**

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jta/bitronix/PoolingDataSourceBeanTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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.
@@ -17,6 +17,8 @@
 package org.springframework.boot.jta.bitronix;
 
 import java.sql.Connection;
+import java.sql.SQLFeatureNotSupportedException;
+import java.util.logging.Logger;
 
 import javax.sql.XAConnection;
 import javax.sql.XADataSource;
@@ -60,6 +62,28 @@ class PoolingDataSourceBeanTests {
 		assertThat(this.bean.getUniqueName()).isEqualTo("un");
 	}
 
+	@Test
+	void shouldReturnGlobalLoggerWhenDataSourceIsAbsent() throws SQLFeatureNotSupportedException {
+		assertThat(this.bean.getParentLogger()).isSameAs(Logger.getLogger(Logger.GLOBAL_LOGGER_NAME));
+	}
+
+	@Test
+	void shouldReturnGlobalLoggerWhenDataSourceThrowsException() throws SQLFeatureNotSupportedException {
+		XADataSource dataSource = mock(XADataSource.class);
+		given(dataSource.getParentLogger()).willThrow(new SQLFeatureNotSupportedException());
+		this.bean.setDataSource(dataSource);
+		assertThat(this.bean.getParentLogger()).isSameAs(Logger.getLogger(Logger.GLOBAL_LOGGER_NAME));
+	}
+
+	@Test
+	void shouldReturnParentLoggerFromDataSource() throws SQLFeatureNotSupportedException {
+		Logger logger = Logger.getLogger("test");
+		XADataSource dataSource = mock(XADataSource.class);
+		given(dataSource.getParentLogger()).willReturn(logger);
+		this.bean.setDataSource(dataSource);
+		assertThat(this.bean.getParentLogger()).isSameAs(logger);
+	}
+
 	@Test
 	void setDataSource() throws Exception {
 		XADataSource dataSource = mock(XADataSource.class);