[jboss-cvs] JBossAS SVN: r74962 - projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/common.

[jboss-cvs-commits at lists.jboss.org]

Author: wolfc
Date: 2008-06-24 04:21:56 -0400 (Tue, 24 Jun 2008)
New Revision: 74962

Modified:
   projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/common/AbstractEJB3TestCase.java
Log:
Added check for locating ejb3-interceptors-aop.xml

Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/common/AbstractEJB3TestCase.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/common/AbstractEJB3TestCase.java	2008-06-24 07:11:17 UTC (rev 74961)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/common/AbstractEJB3TestCase.java	2008-06-24 08:21:56 UTC (rev 74962)
@@ -49,7 +49,8 @@
    public static void afterClass() throws Exception
    {
       URL url = Thread.currentThread().getContextClassLoader().getResource("ejb3-interceptors-aop.xml");
-      AspectXmlLoader.undeployXML(url);
+      if(url != null)
+         AspectXmlLoader.undeployXML(url);
       
       if(bootstrap != null)
          bootstrap.shutdown();
@@ -71,6 +72,8 @@
       
       // TODO: AspectDeployment
       URL url = Thread.currentThread().getContextClassLoader().getResource("ejb3-interceptors-aop.xml");
+      if(url == null)
+         throw new IllegalStateException("Can't find ejb3-interceptors-aop.xml on class loader " + Thread.currentThread().getContextClassLoader());
       AspectXmlLoader.deployXML(url);
    }