From 57ee122ab83ced1c1b4aa5fc77eea318906d98a0 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Fri, 17 May 2013 09:00:09 +0000 Subject: [PATCH] WW-4045 Reduces code duplication as FileManager can handle nulls git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1483700 13f79535-47bb-0310-9956-ffa450edef68 --- .../xwork2/validator/DefaultActionValidatorManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManager.java b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManager.java index 9bb80e683..30dad54f9 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManager.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManager.java @@ -335,7 +335,7 @@ public class DefaultActionValidatorManager implements ActionValidatorManager { private List loadFile(String fileName, Class clazz, boolean checkFile) { List retList = Collections.emptyList(); URL fileUrl = ClassLoaderUtil.getResource(fileName, clazz); - if ((checkFile && fileUrl != null && fileManager.fileNeedsReloading(fileUrl.toString())) || !validatorFileCache.containsKey(fileName)) { + if ((checkFile && fileManager.fileNeedsReloading(fileUrl)) || !validatorFileCache.containsKey(fileName)) { InputStream is = null; try {