[jboss-cvs] JBossAS SVN: r68683 - in projects/ejb3/trunk/interceptors/src: test/java/org/jboss/ejb3/test/interceptors/direct/unit and 1 other directory.

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

Author: wolfc
Date: 2008-01-08 13:01:42 -0500 (Tue, 08 Jan 2008)
New Revision: 68683

Modified:
   projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/container/ManagedObjectAdvisor.java
   projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/direct/unit/DirectTestCase.java
Log:
Fixed ManagedObjectAdvisor.container

Modified: projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/container/ManagedObjectAdvisor.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/container/ManagedObjectAdvisor.java	2008-01-08 17:19:39 UTC (rev 68682)
+++ projects/ejb3/trunk/interceptors/src/main/java/org/jboss/ejb3/interceptors/container/ManagedObjectAdvisor.java	2008-01-08 18:01:42 UTC (rev 68683)
@@ -52,8 +52,11 @@
    protected ManagedObjectAdvisor(C container, String name, AspectManager manager, Class<?> beanClass)
    {
       super(name, manager);
+      assert container != null : "container is null";
       assert beanClass != null : "beanClass is null";
       
+      this.container = container;
+      
       // For convenience we add the ManagedObject annotation
       annotations.addClassAnnotation(ManagedObject.class, new Object());
       

Modified: projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/direct/unit/DirectTestCase.java
===================================================================
--- projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/direct/unit/DirectTestCase.java	2008-01-08 17:19:39 UTC (rev 68682)
+++ projects/ejb3/trunk/interceptors/src/test/java/org/jboss/ejb3/test/interceptors/direct/unit/DirectTestCase.java	2008-01-08 18:01:42 UTC (rev 68683)
@@ -28,6 +28,7 @@
 
 import org.jboss.aop.AspectManager;
 import org.jboss.aop.AspectXmlLoader;
+import org.jboss.ejb3.interceptors.container.ManagedObjectAdvisor;
 import org.jboss.ejb3.interceptors.direct.DirectContainer;
 import org.jboss.ejb3.test.interceptors.direct.DirectBean;
 import org.jboss.ejb3.test.interceptors.direct.DirectInterceptor;
@@ -47,6 +48,20 @@
 {
    private static final Logger log = Logger.getLogger(DirectTestCase.class);
    
+   private class MyContainer<T> extends DirectContainer<T>
+   {
+      public MyContainer(String name, String domainName, Class<? extends T> beanClass)
+      {
+         super(name, domainName, beanClass);
+      }
+
+      public void testAdvisor()
+      {
+         assertNotNull("container not set in managed object advisor", ((ManagedObjectAdvisor<T, DirectContainer<T>>) getAdvisor()).getContainer());
+         assertTrue(((ManagedObjectAdvisor<T, DirectContainer<T>>) getAdvisor()).getContainer() == this);
+      }
+   }
+   
    public void test() throws Throwable
    {
       AspectManager.verbose = true;
@@ -59,7 +74,8 @@
       
       assertEquals(0, DirectInterceptor.postConstructs);
       
-      DirectContainer<DirectBean> container = new DirectContainer<DirectBean>("DirectBean", "InterceptorContainer", DirectBean.class);
+      MyContainer<DirectBean> container = new MyContainer<DirectBean>("DirectBean", "InterceptorContainer", DirectBean.class);
+      container.testAdvisor();
       
       DirectBean bean = container.construct();