[jboss-cvs] JBossAS SVN: r60023 - projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/xml.

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

Author: adrian at jboss.org
Date: 2007-01-26 09:36:09 -0500 (Fri, 26 Jan 2007)
New Revision: 60023

Modified:
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/xml/JavaBeanHandler.java
Log:
Fix the javabean2 test.

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/xml/JavaBeanHandler.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/xml/JavaBeanHandler.java	2007-01-26 14:30:29 UTC (rev 60022)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/config/xml/JavaBeanHandler.java	2007-01-26 14:36:09 UTC (rev 60023)
@@ -83,7 +83,33 @@
    public Object endElement(Object o, QName qName, ElementBinding element)
    {
       Holder holder = (Holder) o;
-      return holder.getValue();
+      Object result = holder.getValue();
+      
+      // We still have a constructor because there was no constructor element
+      if (result != null && result instanceof Ctor)
+      {
+         Ctor ctor = (Ctor) result;
+         result = ctor.getValue();
+
+         // The constructor was never run
+         if (result == null)
+         {
+            try
+            {
+               return ctor.newInstance();
+            }
+            catch (Throwable t)
+            {
+               new RuntimeException("Unable to construct object javabean", t);
+            }
+         }
+      }
+      
+      // Sanity check
+      if (result == null)
+         throw new IllegalStateException("Null object creating javabean");
+      
+      return result;
    }
 }