[jboss-svn-commits] JBoss Common SVN: r3369 - in jbossxb/trunk/src/main/java/org/jboss/xb: spi and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: alesj
Date: 2009-07-10 10:44:39 -0400 (Fri, 10 Jul 2009)
New Revision: 3369

Modified:
   jbossxb/trunk/src/main/java/org/jboss/xb/builder/JBossXBNoSchemaBuilder.java
   jbossxb/trunk/src/main/java/org/jboss/xb/spi/BeanAdapterFactory.java
Log:
Fix NPE due to no properties

Modified: jbossxb/trunk/src/main/java/org/jboss/xb/builder/JBossXBNoSchemaBuilder.java
===================================================================
--- jbossxb/trunk/src/main/java/org/jboss/xb/builder/JBossXBNoSchemaBuilder.java	2009-07-10 03:20:28 UTC (rev 3368)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/builder/JBossXBNoSchemaBuilder.java	2009-07-10 14:44:39 UTC (rev 3369)
@@ -1689,7 +1689,7 @@
                   {
                      BeanAdapterFactory wrapperBeanFactory = ((BeanHandler)wrapperType.getHandler()).getBeanAdapterFactory();
                      Map<QName, AbstractPropertyHandler> properties = wrapperBeanFactory.getProperties();
-                     if(!properties.containsKey(boundQName))
+                     if(properties.containsKey(boundQName) == false)
                      {
                         propertyHandler = new MapPropertyHandler(JBossXBBuilder.configuration, property, localPropertyType, true);
                         wrapperBeanFactory.addProperty(boundQName, propertyHandler);

Modified: jbossxb/trunk/src/main/java/org/jboss/xb/spi/BeanAdapterFactory.java
===================================================================
--- jbossxb/trunk/src/main/java/org/jboss/xb/spi/BeanAdapterFactory.java	2009-07-10 03:20:28 UTC (rev 3368)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/spi/BeanAdapterFactory.java	2009-07-10 14:44:39 UTC (rev 3369)
@@ -21,23 +21,23 @@
 */
 package org.jboss.xb.spi;
 
-import java.util.HashMap;
 import java.util.Map;
-
 import javax.xml.namespace.QName;
 
+import org.jboss.util.collection.CollectionsFactory;
 import org.jboss.xb.builder.runtime.AbstractPropertyHandler;
 
 /**
  * BeanAdapterFactory.
  * 
  * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
  * @version $Revision: 1.1 $
  */
 public abstract class BeanAdapterFactory
 {
    /** The properties */
-   private Map<QName, AbstractPropertyHandler> properties;
+   private Map<QName, AbstractPropertyHandler> properties = CollectionsFactory.createLazyMap();
    
    /** The wildcard handler */
    private AbstractPropertyHandler wildcardHandler;
@@ -50,8 +50,6 @@
     */
    public AbstractPropertyHandler getPropertyHandler(QName qName)
    {
-      if (properties == null)
-         return null;
       return properties.get(qName);
    }
 
@@ -78,10 +76,9 @@
       if (propertyHandler == null)
          throw new IllegalArgumentException("Null property handler");
 
-      if (properties == null)
-         properties = new HashMap<QName, AbstractPropertyHandler>();
       properties.put(qName, propertyHandler);
    }
+
    /**
     * Get the available properties as a string
     * 
@@ -89,7 +86,7 @@
     */
    public String getAvailable()
    {
-      if (properties == null)
+      if (properties.isEmpty())
          return "<nothing>";
       else
          return properties.keySet().toString();