Author: gpetracek
Date: Wed Nov 24 14:49:34 2010
New Revision: 1038634
URL: http://svn.apache.org/viewvc?rev=1038634&view=rev
Log:
OWB-407 intermediate result
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java?rev=1038634&r1=1038633&r2=1038634&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
Wed Nov 24 14:49:34 2010
@@ -84,6 +84,7 @@ import org.apache.webbeans.util.ClassUti
import org.apache.webbeans.util.WebBeansAnnotatedTypeUtil;
import org.apache.webbeans.util.WebBeansConstants;
import org.apache.webbeans.util.WebBeansUtil;
+import org.apache.webbeans.util.InjectionExceptionUtils;
import org.apache.webbeans.xml.WebBeansXMLConfigurator;
import org.apache.webbeans.xml.XMLAnnotationTypeManager;
import org.apache.webbeans.xml.XMLSpecializesManager;
@@ -434,7 +435,7 @@ public class BeansDeployer
beans = resolver.findByAlternatives(beans);
if(beans.size() > 1)
{
- throw new
WebBeansConfigurationException("There are two different beans with name : " +
beanName + " in the deployment archieve");
+
InjectionExceptionUtils.throwAmbiguousResolutionExceptionForBeanName(beans,
beanName);
}
}
}