Skip to content

Commit

Permalink
Merge pull request #30601 from cwatzl
Browse files Browse the repository at this point in the history
* pr/30601:
  Update copyright year of changed file
  Flag PathResourceResolver#resolve*Internal as @nullable

Closes gh-30601
  • Loading branch information
snicoll committed Jun 19, 2023
2 parents 8bb4c16 + 294cdba commit 2b98165
Showing 1 changed file with 3 additions and 1 deletion.
@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -133,13 +133,15 @@ public UrlPathHelper getUrlPathHelper() {


@Override
@Nullable
protected Resource resolveResourceInternal(@Nullable HttpServletRequest request, String requestPath,
List<? extends Resource> locations, ResourceResolverChain chain) {

return getResource(requestPath, request, locations);
}

@Override
@Nullable
protected String resolveUrlPathInternal(String resourcePath, List<? extends Resource> locations,
ResourceResolverChain chain) {

Expand Down

0 comments on commit 2b98165

Please sign in to comment.