Skip to content

Commit 77e00f1

Browse files
committed
Polishing
1 parent ade139f commit 77e00f1

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

spring-context/src/main/java/org/springframework/context/support/LiveBeansView.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ public class LiveBeansView implements LiveBeansViewMBean, ApplicationContextAwar
6060

6161
private static String applicationName;
6262

63+
6364
static void registerApplicationContext(ConfigurableApplicationContext applicationContext) {
6465
String mbeanDomain = applicationContext.getEnvironment().getProperty(MBEAN_DOMAIN_PROPERTY_NAME);
6566
if (mbeanDomain != null) {
@@ -90,7 +91,8 @@ static void unregisterApplicationContext(ConfigurableApplicationContext applicat
9091
}
9192
catch (Throwable ex) {
9293
throw new ApplicationContextException("Failed to unregister LiveBeansView MBean", ex);
93-
} finally {
94+
}
95+
finally {
9496
applicationName = null;
9597
}
9698
}

spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2013 the original author or authors.
2+
* Copyright 2002-2016 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -115,7 +115,7 @@ public void testProxyingDecorator() throws Exception {
115115
assertTrue(AopUtils.isAopProxy(bean));
116116
Advisor[] advisors = ((Advised) bean).getAdvisors();
117117
assertEquals("Incorrect number of advisors", 1, advisors.length);
118-
assertEquals("Incorrect advice class.", DebugInterceptor.class, advisors[0].getAdvice().getClass());
118+
assertEquals("Incorrect advice class", DebugInterceptor.class, advisors[0].getAdvice().getClass());
119119
}
120120

121121
@Test
@@ -139,8 +139,8 @@ public void testChainedDecorators() throws Exception {
139139
assertTrue(AopUtils.isAopProxy(bean));
140140
Advisor[] advisors = ((Advised) bean).getAdvisors();
141141
assertEquals("Incorrect number of advisors", 2, advisors.length);
142-
assertEquals("Incorrect advice class.", DebugInterceptor.class, advisors[0].getAdvice().getClass());
143-
assertEquals("Incorrect advice class.", NopInterceptor.class, advisors[1].getAdvice().getClass());
142+
assertEquals("Incorrect advice class", DebugInterceptor.class, advisors[0].getAdvice().getClass());
143+
assertEquals("Incorrect advice class", NopInterceptor.class, advisors[1].getAdvice().getClass());
144144
}
145145

146146
@Test
@@ -235,7 +235,6 @@ public BeanDefinition parse(Element element, ParserContext parserContext) {
235235
definition.setPropertyValues(mpvs);
236236

237237
parserContext.getRegistry().registerBeanDefinition(element.getAttribute("id"), definition);
238-
239238
return null;
240239
}
241240
}

0 commit comments

Comments
 (0)