[infinispan-commits] Infinispan SVN: r531 - trunk/core/src/main/java/org/infinispan/config/parsing.

[infinispan-commits at lists.jboss.org]

Author: vblagojevic at jboss.com
Date: 2009-07-09 04:48:28 -0400 (Thu, 09 Jul 2009)
New Revision: 531

Modified:
   trunk/core/src/main/java/org/infinispan/config/parsing/AutomatedXmlConfigurationParserImpl.java
Log:
ns

Modified: trunk/core/src/main/java/org/infinispan/config/parsing/AutomatedXmlConfigurationParserImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/parsing/AutomatedXmlConfigurationParserImpl.java	2009-07-09 08:44:19 UTC (rev 530)
+++ trunk/core/src/main/java/org/infinispan/config/parsing/AutomatedXmlConfigurationParserImpl.java	2009-07-09 08:48:28 UTC (rev 531)
@@ -261,7 +261,8 @@
             reader.setParser(this);
             reader.process(e, bean);
          } catch (Exception e1) {
-            throw new ConfigurationException(e1);
+            throw new ConfigurationException("Exception while using custom reader " + readerClass
+                     + " for element " + e.getNodeName(), e1);
          }
       } else {
          //normal processing
@@ -296,7 +297,7 @@
       if (matchedAttributeToSetter) {
          String attValue = getAttributeValue((Element) node, a.name());
          if (attValue != null && attValue.length() > 0) {
-            Object o = convertToType(attValue, parameterType);
+            Object o = convertToPrimitiveType(attValue, parameterType);
             try {              
                m.invoke(bean, o);
             } catch (Exception ae) {
@@ -351,19 +352,20 @@
                   } catch (Exception ae) {
                      throw new ConfigurationException("Illegal props " + props + ",type="
                               + parameterType + ", method=" + m, ae);
-                  } 
-               } else if (parameterType.isAssignableFrom(String.class) || parameterType.isPrimitive()) {                  
+                  }
+               } else if (parameterType.isAssignableFrom(String.class) || parameterType.isPrimitive()) {
                   String value = props.getProperty(propertyName);
                   if (value != null && value.length() > 0) {
                      Object o = value;
                      if (parameterType.isPrimitive()) {
-                        o = convertToType(value, parameterType);
+                        o = convertToPrimitiveType(value, parameterType);
                      }
                      try {
                         m.invoke(bean, o);
                      } catch (Exception ae) {
-                        throw new ConfigurationException("Illegal value " + o
-                                 + ",type=" + parameterType + ", method=" + m, ae);
+                        throw new ConfigurationException("Illegal value of extracted property "
+                                 + value + ", converted to " + o + ",type=" + parameterType
+                                 + ", method=" + m, ae);
                      }
                   }
                }
@@ -377,7 +379,7 @@
       return false;
    }
    
-   private Object convertToType(String attValue, Class<?> clazz) {
+   private Object convertToPrimitiveType(String attValue, Class<?> clazz) {
       if (clazz.isPrimitive()) {
          if (clazz.isAssignableFrom(Boolean.TYPE)) {
             return Boolean.parseBoolean(attValue);