Author: rdonkin
Date: Thu Apr 21 12:13:58 2005
New Revision: 164106
URL: http://svn.apache.org/viewcvs?rev=164106&view=rev
Log:
Added null check
Modified:
jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/registry/DefaultXMLBeanInfoRegistry.java
Modified:
jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/registry/DefaultXMLBeanInfoRegistry.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/registry/DefaultXMLBeanInfoRegistry.java?rev=164106&r1=164105&r2=164106&view=diff
==============================================================================
---
jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/registry/DefaultXMLBeanInfoRegistry.java
(original)
+++
jakarta/commons/proper/betwixt/trunk/src/java/org/apache/commons/betwixt/registry/DefaultXMLBeanInfoRegistry.java
Thu Apr 21 12:13:58 2005
@@ -75,13 +75,18 @@
Class result = null;
Collection cachedClasses = getCachedClasses();
ElementDescriptor mappedDescriptor = mapping.getDescriptor();
+ Class mappedType = mappedDescriptor.getSingularPropertyType();
+ if (mappedType == null) {
+ mappedType = mappedDescriptor.getPropertyType();
+ }
for (Iterator it = cachedClasses.iterator(); it.hasNext();) {
XMLBeanInfo beanInfo = get((Class)it.next());
ElementDescriptor typeDescriptor = beanInfo.getElementDescriptor();
boolean sameName =
mapping.getName().equals(typeDescriptor.getQualifiedName());
if (sameName)
{
- boolean compatibleClass =
mappedDescriptor.getSingularPropertyType().isAssignableFrom(beanInfo.getBeanClass());
+
+ boolean compatibleClass =
mappedType.isAssignableFrom(beanInfo.getBeanClass());
if (compatibleClass ) {
result = beanInfo.getBeanClass();
break;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
