Skip to content

Commit 8bd76b2

Browse files
committed
Handle null locale
1 parent f3e21be commit 8bd76b2

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

springdoc-openapi-common/src/main/java/org/springdoc/core/OpenAPIService.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -732,8 +732,9 @@ public Map<String, Object> getControllerAdviceMap() {
732732
* @return the cached open api
733733
*/
734734
public OpenAPI getCachedOpenAPI(Locale locale) {
735-
if (cachedOpenAPI != null && cachedOpenAPI.containsKey(locale.getLanguage())) {
736-
return cachedOpenAPI.get(locale.getLanguage());
735+
Locale cachedLocale = (locale == null ? Locale.getDefault() : locale);
736+
if (cachedOpenAPI != null && cachedOpenAPI.containsKey(cachedLocale.getLanguage())) {
737+
return cachedOpenAPI.get(cachedLocale.getLanguage());
737738
}
738739
return null;
739740
}
@@ -745,8 +746,9 @@ public OpenAPI getCachedOpenAPI(Locale locale) {
745746
* @param cachedOpenAPI the cached open api
746747
*/
747748
public void setCachedOpenAPI(OpenAPI cachedOpenAPI, Locale locale) {
749+
Locale cachedLocale = (locale == null ? Locale.getDefault() : locale);
748750
if (this.cachedOpenAPI != null) {
749-
this.cachedOpenAPI.put(locale.getLanguage(), cachedOpenAPI);
751+
this.cachedOpenAPI.put(cachedLocale.getLanguage(), cachedOpenAPI);
750752
}
751753
}
752754

0 commit comments

Comments
 (0)