From 09302facdaea6eedd8835e961741732b860d26e1 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Tue, 15 Jan 2013 19:43:43 +0000 Subject: [PATCH] WW-3837 solves problem with NPE git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1433600 13f79535-47bb-0310-9956-ffa450edef68 --- .../xwork2/conversion/annotations/TypeConversion.java | 2 +- .../opensymphony/xwork2/conversion/impl/XWorkConverter.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/TypeConversion.java b/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/TypeConversion.java index a857d49f0..d54bd2f85 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/TypeConversion.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/TypeConversion.java @@ -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 */ diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java b/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java index deec536cf..1fad29ed8 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java @@ -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); } }