Author: pete.muir(a)jboss.org Date: 2009-11-03 17:25:22 -0500 (Tue, 03 Nov 2009) New Revision: 4639 Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/not/bean/InjectionPointTest.java core/trunk/impl/src/main/java/org/jboss/weld/SimpleInjectionTarget.java Log: WELD-228 Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/not/bean/InjectionPointTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/not/bean/InjectionPointTest.java 2009-11-03 21:57:11 UTC (rev 4638) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/not/bean/InjectionPointTest.java 2009-11-03 22:25:22 UTC (rev 4639) @@ -34,7 +34,7 @@ @Resource(destination = WarArtifactDescriptor.WEB_XML_DESTINATION, source = "web.xml") public class InjectionPointTest extends AbstractJSR299Test { - @Test(groups = "ri-broken") + @Test(groups = "jboss-as-broken") @SpecAssertion(section = "5.6.9", id = "ga") //WELD-228 public void testDefinitionErrorDetected() { Modified: core/trunk/impl/src/main/java/org/jboss/weld/SimpleInjectionTarget.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/SimpleInjectionTarget.java 2009-11-03 21:57:11 UTC (rev 4638) +++ core/trunk/impl/src/main/java/org/jboss/weld/SimpleInjectionTarget.java 2009-11-03 22:25:22 UTC (rev 4639) @@ -80,6 +80,13 @@ this.persistenceContextInjectionPoints = Beans.getPersistenceContextInjectionPoints(null, type, beanManager); this.persistenceUnitInjectionPoints = Beans.getPersistenceUnitInjectionPoints(null, type, beanManager); this.resourceInjectionPoints = Beans.getResourceInjectionPoints(null, type, beanManager); + for (InjectionPoint ip : this.injectionPoints) + { + if (ip.getType().equals(InjectionPoint.class)) + { + throw new DefinitionException("Cannot inject an InjectionPoint on a non-contextual type. Type: " + type + "; InjectionPoint: " + ip); + } + } } public T produce(CreationalContext<T> ctx)