[jboss-cvs] JBossAS SVN: r60022 - projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency.

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

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

Modified:
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/InstantiateAction.java
Log:
Throw a meaningful error if the instantiate joinpoint returns a null object.

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/InstantiateAction.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/InstantiateAction.java	2007-01-26 14:18:14 UTC (rev 60021)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/InstantiateAction.java	2007-01-26 14:30:29 UTC (rev 60022)
@@ -50,23 +50,19 @@
       final Joinpoint joinPoint = configurator.getConstructorJoinPoint(info, metaData.getConstructor(), metaData);
 
       Object object = dispatchJoinPoint(context, joinPoint);
+      if (object == null)
+         throw new IllegalStateException("Instantiate joinpoint returned a null object: " + joinPoint);
       context.setTarget(object);
 
       try
       {
-         if (object != null)
+         if (info == null)
          {
-            if (context.getBeanInfo() == null)
-            {
-               info = configurator.getBeanInfo(object.getClass());
-               context.setBeanInfo(info);
-            }
-
-//            if (object instanceof KernelControllerContextAware)
-//               ((KernelControllerContextAware) object).setKernelControllerContext(context);
-
-            controller.addInstantiatedContext(context);
+            info = configurator.getBeanInfo(object.getClass());
+            context.setBeanInfo(info);
          }
+
+         controller.addInstantiatedContext(context);
       }
       catch (Throwable t)
       {