FORGE-1699 - Performance enhancement - faster single instance lookup …

…(uses existing cache)
forge · Apr 4, 2014 · 6188b65 · 6188b65
1 parent 02f75c6
commit 6188b65
Showing 1 changed file with 4 additions and 21 deletions.
diff --git a/container/src/main/java/org/jboss/forge/furnace/impl/addons/ImportedImpl.java b/container/src/main/java/org/jboss/forge/furnace/impl/addons/ImportedImpl.java
@@ -115,27 +115,10 @@ private ExportedInstance<T> getExportedInstance()
          @Override
          public ExportedInstance<T> call() throws Exception
          {
-            ExportedInstance<T> result = null;
-
-            for (Addon addon : addonRegistry.getAddons())
-            {
-               if (AddonStatus.STARTED.equals(addon.getStatus()))
-               {
-                  ServiceRegistry serviceRegistry = addon.getServiceRegistry();
-                  if (type != null)
-                  {
-                     result = serviceRegistry.getExportedInstance(type);
-                  }
-                  else
-                  {
-                     result = serviceRegistry.getExportedInstance(typeName);
-                  }
-               }
-               if (result != null)
-                  break;
-            }
-
-            return result;
+            Iterator<ExportedInstance<T>> iterator = getExportedInstances().iterator();
+            if (iterator.hasNext())
+               return iterator.next();
+            return null;
          }
       });