Browse Source

Merge branch '5.1.x'

pull/23645/head
Stephane Nicoll 6 years ago
parent
commit
37d950c5d6
  1. 4
      spring-core/src/main/java/org/springframework/core/io/DefaultResourceLoader.java

4
spring-core/src/main/java/org/springframework/core/io/DefaultResourceLoader.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2017 the original author or authors.
* Copyright 2002-2019 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.
@ -144,7 +144,7 @@ public class DefaultResourceLoader implements ResourceLoader { @@ -144,7 +144,7 @@ public class DefaultResourceLoader implements ResourceLoader {
public Resource getResource(String location) {
Assert.notNull(location, "Location must not be null");
for (ProtocolResolver protocolResolver : this.protocolResolvers) {
for (ProtocolResolver protocolResolver : getProtocolResolvers()) {
Resource resource = protocolResolver.resolve(location, this);
if (resource != null) {
return resource;

Loading…
Cancel
Save