svn commit: r1433600 - in /struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/conversion: annotations/TypeConversion.java impl/XWorkConverter.java

[lukaszlenart]

Author: lukaszlenart
Date: Tue Jan 15 19:43:43 2013
New Revision: 1433600

URL: http://svn.apache.org/viewvc?rev=1433600&view=rev
Log:
WW-3837 solves problem with NPE

Modified:
    
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/TypeConversion.java
    
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java

Modified: 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/TypeConversion.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/TypeConversion.java?rev=1433600&r1=1433599&r2=1433600&view=diff
==============================================================================
--- 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/TypeConversion.java
 (original)
+++ 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/TypeConversion.java
 Tue Jan 15 19:43:43 2013
@@ -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
      */

Modified: 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java?rev=1433600&r1=1433599&r2=1433600&view=diff
==============================================================================
--- 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java
 (original)
+++ 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java
 Tue Jan 15 19:43:43 2013
@@ -440,6 +440,9 @@ public class XWorkConverter extends Defa
                     }
                     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 Defa
 
         if (reloadingConfigs) {
             URL fileUrl = 
ClassLoaderUtil.getResource(buildConverterFilename(clazz), clazz);
-            if (fileManager.fileNeedsReloading(fileUrl.toString())) {
+            if (fileManager.fileNeedsReloading(fileUrl)) {
                 mapping = buildConverterMapping(clazz);
             }
         }