Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-11 01:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-3837 solves problem with NPE

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1433600 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Lukasz Lenart
2013-01-15 19:43:43 +00:00
parent 2db92f7040
commit 09302facda
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/TypeConversion.java
+1 -1
View File
@@ -155,7 +155,7 @@ public @interface TypeConversion {
/**
* The ConversionRule can be a PROPERTY, KEY, KEY_PROPERTY, ELEMENT, COLLECTION (deprecated) or a MAP.
* Note: Collection and Map vonversion rules can be determined via com.opensymphony.xwork2.util.DefaultObjectTypeDeterminer.
* Note: Collection and Map conversion rules can be determined via com.opensymphony.xwork2.util.DefaultObjectTypeDeterminer.
*
* @see com.opensymphony.xwork2.conversion.impl.DefaultObjectTypeDeterminer
*/
xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java
+4 -1
View File
@@ -440,6 +440,9 @@ public class XWorkConverter extends DefaultTypeConverter {
}
return converter;
} catch (Throwable t) {
if (LOG.isDebugEnabled()) {
LOG.debug("Got exception trying to resolve convert for class [#0] and property [#1]", t, clazz.getName(), property);
}
noMapping.add(clazz);
}
}
@@ -753,7 +756,7 @@ public class XWorkConverter extends DefaultTypeConverter {
if (reloadingConfigs) {
URL fileUrl = ClassLoaderUtil.getResource(buildConverterFilename(clazz), clazz);
if (fileManager.fileNeedsReloading(fileUrl.toString())) {
if (fileManager.fileNeedsReloading(fileUrl)) {
mapping = buildConverterMapping(clazz);
}
}