[jboss-cvs] JBossAS SVN: r63306 - in projects/microcontainer/trunk/kernel/src/main/org/jboss: kernel/spi/registry and 1 other directory.

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

Author: alesj
Date: 2007-06-01 11:48:01 -0400 (Fri, 01 Jun 2007)
New Revision: 63306

Modified:
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractDependencyValueMetaData.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/spi/registry/KernelRegistryEntry.java
Log:
JBMICROCONT-176.

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractDependencyValueMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractDependencyValueMetaData.java	2007-06-01 15:02:03 UTC (rev 63305)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractDependencyValueMetaData.java	2007-06-01 15:48:01 UTC (rev 63306)
@@ -155,10 +155,15 @@
          return null;
 
       Object result = lookup.getTarget();
-      if (property != null && lookup instanceof AttributeDispatchContext)
+      if (property != null)
       {
-         AttributeDispatchContext adc = (AttributeDispatchContext) lookup;
-         result = adc.get(property);
+         if (lookup instanceof AttributeDispatchContext)
+         {
+            AttributeDispatchContext adc = (AttributeDispatchContext) lookup;
+            result = adc.get(property);
+         }
+         else
+            throw new IllegalArgumentException("Cannot use property attribute, context is not AttributeDispatchContext: " + this);
       }
       return info != null ? info.convertValue(result) : result;
    }

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/spi/registry/KernelRegistryEntry.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/spi/registry/KernelRegistryEntry.java	2007-06-01 15:02:03 UTC (rev 63305)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/spi/registry/KernelRegistryEntry.java	2007-06-01 15:48:01 UTC (rev 63306)
@@ -33,17 +33,9 @@
 public interface KernelRegistryEntry extends JBossInterface, ControllerContext
 {
    /**
-    * Get the name
-    * 
-    * @return the name
-    */
-   Object getName();
-   
-   /**
     * Set the name
     * 
     * @param name the name
     */
-   void setName(Object name);
-   
+   void setName(Object name);   
 }