Skip to content

Commit 2b98165

Browse files
committed
Merge pull request #30601 from cwatzl
* pr/30601: Update copyright year of changed file Flag PathResourceResolver#resolve*Internal as @nullable Closes gh-30601
2 parents 8bb4c16 + 294cdba commit 2b98165

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

spring-webmvc/src/main/java/org/springframework/web/servlet/resource/PathResourceResolver.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2022 the original author or authors.
2+
* Copyright 2002-2023 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.
@@ -133,13 +133,15 @@ public UrlPathHelper getUrlPathHelper() {
133133

134134

135135
@Override
136+
@Nullable
136137
protected Resource resolveResourceInternal(@Nullable HttpServletRequest request, String requestPath,
137138
List<? extends Resource> locations, ResourceResolverChain chain) {
138139

139140
return getResource(requestPath, request, locations);
140141
}
141142

142143
@Override
144+
@Nullable
143145
protected String resolveUrlPathInternal(String resourcePath, List<? extends Resource> locations,
144146
ResourceResolverChain chain) {
145147

0 commit comments

Comments
 (0)