Author: lukaszlenart
Date: Fri May 17 09:00:09 2013
New Revision: 1483700
URL: http://svn.apache.org/r1483700
Log:
WW-4045 Reduces code duplication as FileManager can handle nulls
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManager.java
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManager.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManager.java?rev=1483700&r1=1483699&r2=1483700&view=diff
==============================================================================
---
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManager.java
(original)
+++
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/DefaultActionValidatorManager.java
Fri May 17 09:00:09 2013
@@ -335,7 +335,7 @@ public class DefaultActionValidatorManag
private List<ValidatorConfig> loadFile(String fileName, Class clazz,
boolean checkFile) {
List<ValidatorConfig> 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 {
