You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by ch...@apache.org on 2012/02/12 18:33:39 UTC
git commit: [DELTASPIKE-72] BeanManagerProvider#getBeanManager should
fail fast if there is no bean-manager
Updated Branches:
refs/heads/master b739c41c9 -> 6e0a621c6
[DELTASPIKE-72] BeanManagerProvider#getBeanManager should fail fast if there is no bean-manager
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/6e0a621c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/6e0a621c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/6e0a621c
Branch: refs/heads/master
Commit: 6e0a621c684e9a91d8fc64ee9ef4c9e9b52e0f0f
Parents: b739c41
Author: Christian Kaltepoth <ch...@apache.org>
Authored: Sun Feb 12 17:49:06 2012 +0100
Committer: Christian Kaltepoth <ch...@apache.org>
Committed: Sun Feb 12 17:49:06 2012 +0100
----------------------------------------------------------------------
.../core/api/provider/BeanManagerProvider.java | 18 ++++++++++-----
1 files changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/6e0a621c/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/BeanManagerProvider.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/BeanManagerProvider.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/BeanManagerProvider.java
index f53213a..db44228 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/BeanManagerProvider.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/BeanManagerProvider.java
@@ -94,9 +94,12 @@ public class BeanManagerProvider implements Extension
/**
- * The active {@link BeanManager} for the current application (/{@link ClassLoader})
- *
- * @return the current bean-manager
+ * The active {@link BeanManager} for the current application (/{@link ClassLoader}). This method will throw an
+ * {@link IllegalStateException} if the BeanManager cannot be found.
+ *
+ * @return the current bean-manager, never <code>null</code>
+ * @throws IllegalStateException
+ * if the BeanManager cannot be found
*/
public BeanManager getBeanManager()
{
@@ -108,15 +111,18 @@ public class BeanManagerProvider implements Extension
{
result = resolveBeanManagerViaJndi();
- if (result != null)
+ if (result == null)
{
- bms.put(classLoader, result);
+ throw new IllegalStateException("Unable to find BeanManager. " +
+ "Please ensure that you configured the CDI implementation of your choice properly.");
}
+
+ bms.put(classLoader, result);
+
}
return result;
}
-
/**
* It basically doesn't matter which of the system events we use,
* but basically we use the {@link AfterBeanDiscovery} event since it allows to use the