[Jboss-cvs] JBossAS SVN: r56345 - projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins

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

Author: alesj
Date: 2006-08-28 10:51:05 -0400 (Mon, 28 Aug 2006)
New Revision: 56345

Modified:
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractTypeMetaData.java
Log:
Small fix - try/catch.

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractTypeMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractTypeMetaData.java	2006-08-28 14:48:57 UTC (rev 56344)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractTypeMetaData.java	2006-08-28 14:51:05 UTC (rev 56345)
@@ -131,6 +131,7 @@
 
    protected Object preinstantiatedLookup(ClassLoader cl, Class expected)
    {
+      Object result = null;
       if (propertyName != null && beanName != null)
       {
          try
@@ -138,17 +139,16 @@
             KernelControllerContext context = (KernelControllerContext) controller.getContext(beanName, ControllerState.INSTANTIATED);
             TargettedJoinpoint joinpoint = configurator.getPropertyGetterJoinPoint(context.getBeanInfo(), propertyName);
             joinpoint.setTarget(context.getTarget());
-            Object result = joinpoint.dispatch();
-            if (result != null && expected != null && expected.isAssignableFrom(result.getClass()) == false)
-               throw new ClassCastException(result.getClass() + " is not a " + expected.getName());
-            return result;
+            result = joinpoint.dispatch();
          }
          catch (Throwable t)
          {
-            log.warn("Exception in preinstantiated lookup: " + t, t);
+            log.warn("Exception in preinstantiated lookup: " + t);
          }
+         if (result != null && expected != null && expected.isAssignableFrom(result.getClass()) == false)
+            throw new ClassCastException(result.getClass() + " is not a " + expected.getName());
       }
-      return null;
+      return result;
    }
 
    /**