[webbeans-commits] Webbeans SVN: r3465 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml and 1 other directory.
Author: pete.muir(a)jboss.org
Date: 2009-08-11 16:18:25 -0400 (Tue, 11 Aug 2009)
New Revision: 3465
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/Validator.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/DecoratorListedTwiceInBeansXmlTest.java
Log:
WBRI-343
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/Validator.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/Validator.java 2009-08-11 16:09:30 UTC
(rev 3464)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/Validator.java 2009-08-11 20:18:25 UTC
(rev 3465)
@@ -278,6 +278,10 @@
}
for (Class<?> clazz : beanManager.getEnabledDecoratorClasses())
{
+ if (beanManager.getEnabledDecoratorClasses().indexOf(clazz) <
beanManager.getEnabledDecoratorClasses().lastIndexOf(clazz))
+ {
+ throw new DeploymentException("Enabled decorator class" + clazz +
" specified twice");
+ }
if (!decoratorBeanClasses.contains(clazz))
{
throw new DeploymentException("Enabled decorator class " + clazz +
" is not the bean class of at least one decorator bean (detected decorator beans
" + decoratorBeanClasses + ")");
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/DecoratorListedTwiceInBeansXmlTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/DecoratorListedTwiceInBeansXmlTest.java 2009-08-11
16:09:30 UTC (rev 3464)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/DecoratorListedTwiceInBeansXmlTest.java 2009-08-11
20:18:25 UTC (rev 3465)
@@ -19,7 +19,7 @@
@SpecVersion("20090625")
public class DecoratorListedTwiceInBeansXmlTest extends AbstractJSR299Test
{
- @Test(groups = { "ri-broken" })
+ @Test
@SpecAssertion(section="8.2", id="bc")
public void testDecoratorListedTwiceInBeansXmlNotOK()
{