Skip to content

Commit ca0983c

Browse files
committed
Polishing
1 parent 697d14a commit ca0983c

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassWithConditionTests.java

+3
Original file line numberDiff line numberDiff line change
@@ -290,19 +290,22 @@ public ExampleBean bean1() {
290290
@Never
291291
@Import({ConfigurationNotCreated.class, RegistrarNotCreated.class, ImportSelectorNotCreated.class})
292292
static class ImportsNotCreated {
293+
293294
static {
294295
if (true) throw new RuntimeException();
295296
}
296297
}
297298

298299
@Configuration
299300
static class ConfigurationNotCreated {
301+
300302
static {
301303
if (true) throw new RuntimeException();
302304
}
303305
}
304306

305307
static class RegistrarNotCreated implements ImportBeanDefinitionRegistrar {
308+
306309
static {
307310
if (true) throw new RuntimeException();
308311
}

spring-web/src/main/java/org/springframework/web/util/WebUtils.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -154,16 +154,15 @@ public static void setWebAppRootSystemProperty(ServletContext servletContext) th
154154
String root = servletContext.getRealPath("/");
155155
if (root == null) {
156156
throw new IllegalStateException(
157-
"Cannot set web app root system property when WAR file is not expanded");
157+
"Cannot set web app root system property when WAR file is not expanded");
158158
}
159159
String param = servletContext.getInitParameter(WEB_APP_ROOT_KEY_PARAM);
160160
String key = (param != null ? param : DEFAULT_WEB_APP_ROOT_KEY);
161161
String oldValue = System.getProperty(key);
162162
if (oldValue != null && !StringUtils.pathEquals(oldValue, root)) {
163-
throw new IllegalStateException(
164-
"Web app root system property already set to different value: '" +
165-
key + "' = [" + oldValue + "] instead of [" + root + "] - " +
166-
"Choose unique values for the 'webAppRootKey' context-param in your web.xml files!");
163+
throw new IllegalStateException("Web app root system property already set to different value: '" +
164+
key + "' = [" + oldValue + "] instead of [" + root + "] - " +
165+
"Choose unique values for the 'webAppRootKey' context-param in your web.xml files!");
167166
}
168167
System.setProperty(key, root);
169168
servletContext.log("Set web app root system property: '" + key + "' = [" + root + "]");

0 commit comments

Comments
 (0)