Better error messages

weld · Oct 28, 2009 · 8ccd0bc · 8ccd0bc
1 parent e6ee2f3
commit 8ccd0bc
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/impl/src/main/java/org/jboss/weld/servlet/ServletHelper.java b/impl/src/main/java/org/jboss/weld/servlet/ServletHelper.java
@@ -34,10 +34,16 @@ public static BeanManagerImpl getModuleBeanManager(ServletContext ctx)
    {
       if (ctx == null)
       {
-         throw new IllegalArgumentException("Must provide the Servlet Context");
+         throw new IllegalArgumentException("ServletContext is null");
       }
       BeanDeploymentArchive beanDeploymentArchive = Container.instance().deploymentServices().get(ServletServices.class).getBeanDeploymentArchive(ctx);
-      return Container.instance().beanDeploymentArchives().get(beanDeploymentArchive).getCurrent();
+      BeanManagerImpl beanManagerImpl = Container.instance().beanDeploymentArchives().get(beanDeploymentArchive);
+      if (beanManagerImpl == null)
+      {
+         throw new IllegalArgumentException("Unable to find BeanManager. BeanDeploymentArchive: " + beanDeploymentArchive + "; ServletContext: " + ctx);
+      }
+      // Actually we need the manager for the current activity
+      return beanManagerImpl.getCurrent();
    }
 
 }