Skip to content

Commit 4307110

Browse files
committed
Polishing (backported from master)
1 parent bb530dc commit 4307110

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/AcceptHeaderLocaleResolver.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2020 the original author or authors.
2+
* Copyright 2002-2021 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.
@@ -72,7 +72,7 @@ public List<Locale> getSupportedLocales() {
7272
/**
7373
* Configure a fixed default locale to fall back on if the request does not
7474
* have an "Accept-Language" header.
75-
* <p>By default this is not set in which case when there is "Accept-Language"
75+
* <p>By default this is not set in which case when there is no "Accept-Language"
7676
* header, the default locale for the server is used as defined in
7777
* {@link HttpServletRequest#getLocale()}.
7878
* @param defaultLocale the default locale to use

src/docs/asciidoc/core/core-beans.adoc

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10657,9 +10657,8 @@ architectures that build upon the well-known Spring programming model.
1065710657
[[context-functionality-events-annotation]]
1065810658
==== Annotation-based Event Listeners
1065910659

10660-
As of Spring 4.2, you can register an event listener on any public method of a managed
10661-
bean by using the `@EventListener` annotation. The `BlockedListNotifier` can be rewritten as
10662-
follows:
10660+
You can register an event listener on any method of a managed bean by using the
10661+
`@EventListener` annotation. The `BlockedListNotifier` can be rewritten as follows:
1066310662

1066410663
[source,java,indent=0,subs="verbatim,quotes",role="primary"]
1066510664
.Java
@@ -10797,9 +10796,9 @@ method signature to return the event that should be published, as the following
1079710796
NOTE: This feature is not supported for
1079810797
<<context-functionality-events-async, asynchronous listeners>>.
1079910798

10800-
This new method publishes a new `ListUpdateEvent` for every `BlockedListEvent` handled by the
10801-
method above. If you need to publish several events, you can return a `Collection` of events
10802-
instead.
10799+
The `handleBlockedListEvent()` method publishes a new `ListUpdateEvent` for every
10800+
`BlockedListEvent` that it handles. If you need to publish several events, you can return
10801+
a `Collection` or an array of events instead.
1080310802

1080410803

1080510804
[[context-functionality-events-async]]

0 commit comments

Comments
 (0)