Add isBeanManagerAvailable to BeanManagerProvider

This allows modules to gracefully degrade if the BeanManager can't be found
weld · Sep 3, 2010 · baf5031 · baf5031
1 parent ad6a4a5
commit baf5031
Showing 1 changed file with 17 additions and 5 deletions.
diff --git a/impl/src/main/java/org/jboss/weld/extensions/beanManager/BeanManagerAware.java b/impl/src/main/java/org/jboss/weld/extensions/beanManager/BeanManagerAware.java
@@ -76,11 +76,6 @@ protected BeanManager getBeanManager()
    {
       if (beanManager == null)
       {
-         if (beanManagerProviders.isEmpty())
-         {
-            loadServices();
-            Collections.sort(beanManagerProviders, new Sortable.Comparator());
-         }
          beanManager = lookupBeanManager();
       }
       if (beanManager == null)
@@ -89,6 +84,18 @@ protected BeanManager getBeanManager()
       }
       return beanManager;
    }
+
+   protected boolean isBeanManagerAvailable()
+   {
+      if (beanManager == null)
+      {
+         return lookupBeanManager() != null;
+      }
+      else
+      {
+         return true;
+      }
+   }
 
    private String providersToString()
    {
@@ -112,6 +119,11 @@ private String providersToString()
    private BeanManager lookupBeanManager()
    {
       BeanManager beanManager = null;
+      if (beanManagerProviders.isEmpty())
+      {
+         loadServices();
+         Collections.sort(beanManagerProviders, new Sortable.Comparator());
+      }
       for (BeanManagerProvider provider : beanManagerProviders)
       {
          beanManager = provider.getBeanManager();