svn commit: r1455726 - in /openwebbeans/branches/owb_1.1.x/webbeans-impl/src: main/java/org/apache/webbeans/util/ test/java/org/apache/webbeans/newtests/specalization/disabledspecialization/

[struberg]

Author: struberg
Date: Tue Mar 12 21:56:44 2013
New Revision: 1455726

URL: http://svn.apache.org/r1455726
Log:
OWB-790 fix specialization in disabled beans

backported from trunk

Added:
    
openwebbeans/branches/owb_1.1.x/webbeans-impl/src/test/java/org/apache/webbeans/newtests/specalization/disabledspecialization/
      - copied from r1455547, 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/specalization/disabledspecialization/
    
openwebbeans/branches/owb_1.1.x/webbeans-impl/src/test/java/org/apache/webbeans/newtests/specalization/disabledspecialization/VetoMe.java
      - copied unchanged from r1455655, 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/specalization/disabledspecialization/VetoMe.java
Modified:
    
openwebbeans/branches/owb_1.1.x/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
    
openwebbeans/branches/owb_1.1.x/webbeans-impl/src/test/java/org/apache/webbeans/newtests/specalization/disabledspecialization/DisabledSpecializationTest.java

Modified: 
openwebbeans/branches/owb_1.1.x/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.1.x/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java?rev=1455726&r1=1455725&r2=1455726&view=diff
==============================================================================
--- 
openwebbeans/branches/owb_1.1.x/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
 (original)
+++ 
openwebbeans/branches/owb_1.1.x/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
 Tue Mar 12 21:56:44 2013
@@ -1409,14 +1409,8 @@ public final class WebBeansUtil
         Set<Bean<?>> resolvers = isConfiguredWebBeans(specializedClass, true);
         AlternativesManager altManager = 
webBeansContext.getAlternativesManager();
 
-        if (resolvers != null)
+        if (resolvers != null && !resolvers.isEmpty())
         {
-            if(resolvers.isEmpty())
-            {
-                throw new InconsistentSpecializationException("Specialized 
bean for class : " + specializedClass
-                        + " is not enabled in the deployment.");
-            }
-
             specialized = resolvers.iterator().next();
 
             if(resolvers.size() > 1)

Modified: 
openwebbeans/branches/owb_1.1.x/webbeans-impl/src/test/java/org/apache/webbeans/newtests/specalization/disabledspecialization/DisabledSpecializationTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.1.x/webbeans-impl/src/test/java/org/apache/webbeans/newtests/specalization/disabledspecialization/DisabledSpecializationTest.java?rev=1455726&r1=1455547&r2=1455726&view=diff
==============================================================================
--- 
openwebbeans/branches/owb_1.1.x/webbeans-impl/src/test/java/org/apache/webbeans/newtests/specalization/disabledspecialization/DisabledSpecializationTest.java
 (original)
+++ 
openwebbeans/branches/owb_1.1.x/webbeans-impl/src/test/java/org/apache/webbeans/newtests/specalization/disabledspecialization/DisabledSpecializationTest.java
 Tue Mar 12 21:56:44 2013
@@ -18,6 +18,9 @@
  */
 package org.apache.webbeans.newtests.specalization.disabledspecialization;
 
+import java.util.ArrayList;
+import java.util.Collection;
+
 import org.apache.webbeans.newtests.AbstractUnitTest;
 
 import org.junit.Assert;
@@ -32,7 +35,10 @@ public class DisabledSpecializationTest 
     @Test
     public void testSpecialization() throws Exception{
         addExtension(new VetoMeExtension());
-        startContainer(LoginService.class, MockLoginService.class);
+        Collection<Class<?>> beanClasses = new ArrayList<Class<?>>();
+        beanClasses.add(LoginService.class);
+        beanClasses.add(MockLoginService.class);
+        startContainer(beanClasses);
 
         LoginService loginService = getInstance(LoginService.class);
         Assert.assertNotNull(loginService);