Skip to content

Commit 6ed6c08

Browse files
committed
Polishing
1 parent e4c57a9 commit 6ed6c08

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2018 the original author or authors.
2+
* Copyright 2002-2019 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.
@@ -43,6 +43,7 @@ public class StaticMessageSource extends AbstractMessageSource {
4343

4444

4545
@Override
46+
@Nullable
4647
protected String resolveCodeWithoutArguments(String code, Locale locale) {
4748
return this.messages.get(code + '_' + locale.toString());
4849
}

spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2016 the original author or authors.
2+
* Copyright 2002-2019 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.
@@ -62,7 +62,6 @@ public class StaticMessageSourceTests extends AbstractApplicationContextTests {
6262
@Test
6363
@Override
6464
public void count() {
65-
// These are only checked for current Ctx (not parent ctx)
6665
assertCount(15);
6766
}
6867

0 commit comments

Comments
 (0)