[jboss-cvs] JBossAS SVN: r76179 - in projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel: plugins/registry and 1 other directories.

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

Author: alesj
Date: 2008-07-24 10:24:51 -0400 (Thu, 24 Jul 2008)
New Revision: 76179

Modified:
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/AbstractKernelController.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/registry/AbstractKernelRegistry.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/spi/registry/KernelRegistry.java
Log:
[JBMICROCONT-319]; initial work on KernelRegistry::findEntry.

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/AbstractKernelController.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/AbstractKernelController.java	2008-07-24 14:08:35 UTC (rev 76178)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/AbstractKernelController.java	2008-07-24 14:24:51 UTC (rev 76179)
@@ -160,7 +160,7 @@
          org.jboss.kernel.spi.registry.KernelRegistry registry = kernel.getRegistry();
          try
          {
-            return registry.getEntry(name);
+            return registry.findEntry(name);
          }
          catch (Throwable ignored)
          {

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/registry/AbstractKernelRegistry.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/registry/AbstractKernelRegistry.java	2008-07-24 14:08:35 UTC (rev 76178)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/registry/AbstractKernelRegistry.java	2008-07-24 14:24:51 UTC (rev 76179)
@@ -77,7 +77,7 @@
          log.trace("Registry " + this + " removed registry factory " + factory);
    }
 
-   public KernelRegistryEntry getEntry(Object name)
+   public KernelRegistryEntry findEntry(Object name)
    {
       for (ListIterator<KernelRegistryPlugin> i = factories.listIterator(); i.hasNext();)
       {
@@ -86,9 +86,18 @@
          if (entry != null)
             return entry;
       }
-      throw new KernelRegistryEntryNotFoundException("Entry not found with name: " + name);
+      return null;
    }
 
+   public KernelRegistryEntry getEntry(Object name)
+   {
+      KernelRegistryEntry entry = findEntry(name);
+      if (entry == null)
+         throw new KernelRegistryEntryNotFoundException("Entry not found with name: " + name);
+
+      return entry;
+   }
+
    public boolean containsEntry(Object name)
    {
       Iterator<KernelRegistryPlugin> i = factories.iterator();

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/spi/registry/KernelRegistry.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/spi/registry/KernelRegistry.java	2008-07-24 14:08:35 UTC (rev 76178)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/spi/registry/KernelRegistry.java	2008-07-24 14:24:51 UTC (rev 76179)
@@ -47,15 +47,24 @@
    public static final String KERNEL_REGISTRY_UNREGISTERED = "KERNEL_REGISTRY_UNREGISTERED";
    
    /**
-    * Get a registration
+    * Find a registration
     * 
     * @param name the name of the object
     * @return the registration
     * @throws IllegalArgumentException for a null name
+    */
+   KernelRegistryEntry findEntry(Object name);
+ 
+   /**
+    * Get a registration
+    *
+    * @param name the name of the object
+    * @return the registration
+    * @throws IllegalArgumentException for a null name
     * @throws KernelRegistryEntryNotFoundException when not found
     */
    KernelRegistryEntry getEntry(Object name);
- 
+
    /**
     * Register an object
     *