WELD-307

weld · Jan 16, 2010 · a63383e · a63383e
1 parent 5cd4e52
commit a63383e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/impl/src/main/java/org/jboss/weld/bootstrap/events/BeforeBeanDiscoveryImpl.java b/impl/src/main/java/org/jboss/weld/bootstrap/events/BeforeBeanDiscoveryImpl.java
@@ -25,12 +25,14 @@
 import org.jboss.weld.bootstrap.BeanDeployment;
 import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
 import org.jboss.weld.bootstrap.spi.Deployment;
+import org.jboss.weld.exceptions.DefinitionException;
 import org.jboss.weld.introspector.ForwardingAnnotatedType;
 import org.jboss.weld.literal.InterceptorBindingTypeLiteral;
 import org.jboss.weld.literal.NormalScopeLiteral;
 import org.jboss.weld.literal.QualifierLiteral;
 import org.jboss.weld.literal.ScopeLiteral;
 import org.jboss.weld.literal.StereotypeLiteral;
+import org.jboss.weld.logging.messages.BootstrapMessage;
 import org.jboss.weld.manager.BeanManagerImpl;
 
 public class BeforeBeanDiscoveryImpl extends AbstractBeanDiscoveryEvent implements BeforeBeanDiscovery
@@ -85,6 +87,10 @@ public void addScope(Class<? extends Annotation> scopeType, boolean normal, bool
       {
          getTypeStore().add(scopeType, new NormalScopeLiteral(passivating));
       }
+      else if (passivating)
+      {
+         throw new DefinitionException(BootstrapMessage.PASSIVATING_NON_NORMAL_SCOPE_ILLEGAL, scopeType);
+      }
       else
       {
          getTypeStore().add(scopeType, ScopeLiteral.INSTANCE);

diff --git a/impl/src/main/java/org/jboss/weld/logging/messages/BootstrapMessage.java b/impl/src/main/java/org/jboss/weld/logging/messages/BootstrapMessage.java
@@ -35,6 +35,7 @@ public enum BootstrapMessage
    @MessageId("000114") DEPLOYMENT_REQUIRED,
    @MessageId("000115") BEAN_STORE_MISSING,
    @MessageId("000116") MANAGER_NOT_INITIALIZED,
-   @MessageId("000117") UNSPECIFIED_REQUIRED_SERVICE;
+   @MessageId("000117") UNSPECIFIED_REQUIRED_SERVICE,
+   @MessageId("000118") PASSIVATING_NON_NORMAL_SCOPE_ILLEGAL;
 
 }
diff --git a/impl/src/main/resources/org/jboss/weld/messages/bootstrap_en.properties b/impl/src/main/resources/org/jboss/weld/messages/bootstrap_en.properties
@@ -15,3 +15,4 @@ DEPLOYMENT_REQUIRED=Must start the container with a deployment
 BEAN_STORE_MISSING=No application context BeanStore set
 MANAGER_NOT_INITIALIZED=Manager has not been initialized
 UNSPECIFIED_REQUIRED_SERVICE=Required service {0} has not been specified
+PASSIVATING_NON_NORMAL_SCOPE_ILLEGAL=Only normal scopes can be passivating. Scope {0}