Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing

Browse Source
This commit is contained in:
Andy Wilkinson
2017-06-07 17:14:26 +01:00
parent bddf9232a8
commit a03ddd331c
7 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot/src/main/java/org/springframework/boot/logging/LoggerConfiguration.java
View File

@@ -102,7 +102,8 @@ public final class LoggerConfiguration {
rtn = rtn && ObjectUtils.nullSafeEquals(this.name, other.name);
rtn = rtn && ObjectUtils.nullSafeEquals(this.configuredLevel,
other.configuredLevel);
rtn = rtn && ObjectUtils.nullSafeEquals(this.effectiveLevel, other.effectiveLevel);
rtn = rtn && ObjectUtils.nullSafeEquals(this.effectiveLevel,
other.effectiveLevel);
return rtn;
}
return super.equals(obj);

8
spring-boot/src/test/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactoryTests.java
View File

@@ -263,11 +263,11 @@ public class UndertowEmbeddedServletContainerFactoryTests
}
private ServletContainer getServletContainerFromNewFactory() {
UndertowEmbeddedServletContainer container = (UndertowEmbeddedServletContainer)
getFactory().getEmbeddedServletContainer();
UndertowEmbeddedServletContainer container = (UndertowEmbeddedServletContainer) getFactory()
.getEmbeddedServletContainer();
try {
return ((DeploymentManager) ReflectionTestUtils.getField(container, "manager"))
.getDeployment().getServletContainer();
return ((DeploymentManager) ReflectionTestUtils.getField(container,
"manager")).getDeployment().getServletContainer();
}
finally {
container.stop();

6
spring-boot/src/test/java/org/springframework/boot/jta/atomikos/AtomikosPropertiesTests.java
View File

@@ -75,8 +75,7 @@ public class AtomikosPropertiesTests {
assertThat(properties).contains(defaultOf(defaultSettings,
"com.atomikos.icatch.max_timeout",
"com.atomikos.icatch.default_jta_timeout",
"com.atomikos.icatch.max_actives",
"com.atomikos.icatch.enable_logging",
"com.atomikos.icatch.max_actives", "com.atomikos.icatch.enable_logging",
"com.atomikos.icatch.serial_jta_transactions",
"com.atomikos.icatch.force_shutdown_on_vm_exit",
"com.atomikos.icatch.log_base_name",
@@ -96,7 +95,8 @@ public class AtomikosPropertiesTests {
private Properties loadDefaultSettings() {
try {
Class<?> target = ClassUtils.forName("com.atomikos.icatch.standalone.UserTransactionServiceImp",
Class<?> target = ClassUtils.forName(
"com.atomikos.icatch.standalone.UserTransactionServiceImp",
getClass().getClassLoader());
Method m = target.getMethod("getDefaultProperties");
m.setAccessible(true);