root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid early log provider initialization (and LogAccessor dependency) 

Closes gh-23655
This commit is contained in:
Juergen Hoeller 2019-09-20 21:54:53 +02:00
parent e68132686d
commit 957924ace2
1 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
spring-core/src/main/java/org/springframework/core/io/AbstractResource.java
View File

@ -26,8 +26,10 @@ import java.net.URL;
import java.nio.channels.Channels;
import java.nio.channels.ReadableByteChannel;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.core.NestedIOException;
import org.springframework.core.log.LogAccessor;
import org.springframework.lang.Nullable;
import org.springframework.util.ResourceUtils;
@ -45,8 +47,6 @@ import org.springframework.util.ResourceUtils;
*/
public abstract class AbstractResource implements Resource {
private static final LogAccessor logAccessor = new LogAccessor(AbstractResource.class);
/**
* This implementation checks whether a File can be opened,
* falling back to whether an InputStream can be opened.
@ -55,21 +55,29 @@ public abstract class AbstractResource implements Resource {
@Override
public boolean exists() {
// Try file existence: can we find the file in the file system?
try {
return getFile().exists();
}
catch (IOException ex) {
// Fall back to stream existence: can we open the stream?
if (isFile()) {
try {
getInputStream().close();
return true;
return getFile().exists();
}
catch (Throwable isEx) {
logAccessor.debug(ex,
() -> "Could not close InputStream for resource: " + getDescription());
return false;
catch (IOException ex) {
Log logger = LogFactory.getLog(getClass());
if (logger.isDebugEnabled()) {
logger.debug("Could not retrieve File for existence check of " + getDescription(), ex);
}
}
}
// Fall back to stream existence: can we open the stream?
try {
getInputStream().close();
return true;
}
catch (Throwable ex) {
Log logger = LogFactory.getLog(getClass());
if (logger.isDebugEnabled()) {
logger.debug("Could not retrieve InputStream for existence check of " + getDescription(), ex);
}
return false;
}
}
/**
@ -164,8 +172,10 @@ public abstract class AbstractResource implements Resource {
is.close();
}
catch (IOException ex) {
logAccessor.debug(ex,
() -> "Could not close InputStream for resource: " + getDescription());
Log logger = LogFactory.getLog(getClass());
if (logger.isDebugEnabled()) {
logger.debug("Could not close content-length InputStream for " + getDescription(), ex);
}
}
}
}