Author: dallen6 Date: 2009-06-18 05:44:13 -0400 (Thu, 18 Jun 2009) New Revision: 2849 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java Log: Changed isThrowablePresent so it compiles with JSE 6 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java 2009-06-18 09:25:44 UTC (rev 2848) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java 2009-06-18 09:44:13 UTC (rev 2849) @@ -197,14 +197,14 @@ getCurrentConfiguration().getBeans().destroyAndRemoveBeanInstance(bean, instance); } -// @Override -// protected boolean isThrowablePresent(Class<? extends Throwable> throwableType, Throwable throwable) -// { -// if (throwableType.equals(DefinitionError.class) && getCurrentConfiguration().getManagers().isDefinitionError(throwable)) -// { -// return true; -// } -// -// return super.isThrowablePresent(throwableType, throwable); -// } + //@Override + protected static boolean isThrowablePresent(Class<? extends Throwable> throwableType, Throwable throwable) + { + if (throwableType.equals(DefinitionError.class) && JSR299ConfigurationImpl.get().getManagers().isDefinitionError(throwable)) + { + return true; + } + + return org.jboss.testharness.AbstractTest.isThrowablePresent(throwableType, throwable); + } }