File tree Expand file tree Collapse file tree 2 files changed +3
-3
lines changed
main/java/org/springframework/context/support
test/java/org/springframework/context/support Expand file tree Collapse file tree 2 files changed +3
-3
lines changed Original file line number Diff line number Diff line change 1
1
/*
2
- * Copyright 2002-2018 the original author or authors.
2
+ * Copyright 2002-2019 the original author or authors.
3
3
*
4
4
* Licensed under the Apache License, Version 2.0 (the "License");
5
5
* you may not use this file except in compliance with the License.
@@ -43,6 +43,7 @@ public class StaticMessageSource extends AbstractMessageSource {
43
43
44
44
45
45
@ Override
46
+ @ Nullable
46
47
protected String resolveCodeWithoutArguments (String code , Locale locale ) {
47
48
return this .messages .get (code + '_' + locale .toString ());
48
49
}
Original file line number Diff line number Diff line change 1
1
/*
2
- * Copyright 2002-2016 the original author or authors.
2
+ * Copyright 2002-2019 the original author or authors.
3
3
*
4
4
* Licensed under the Apache License, Version 2.0 (the "License");
5
5
* you may not use this file except in compliance with the License.
@@ -62,7 +62,6 @@ public class StaticMessageSourceTests extends AbstractApplicationContextTests {
62
62
@ Test
63
63
@ Override
64
64
public void count () {
65
- // These are only checked for current Ctx (not parent ctx)
66
65
assertCount (15 );
67
66
}
68
67
You can’t perform that action at this time.
0 commit comments