[jboss-cvs] JBossAS SVN: r71927 - projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container.

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

Author: scott.stark at jboss.org
Date: 2008-04-10 10:36:58 -0400 (Thu, 10 Apr 2008)
New Revision: 71927

Modified:
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/BaseContext.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/BeanContextFactory.java
Log:
Fix the uninstall of the interceptor

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/BaseContext.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/BaseContext.java	2008-04-10 14:36:00 UTC (rev 71926)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/BaseContext.java	2008-04-10 14:36:58 UTC (rev 71927)
@@ -22,7 +22,6 @@
 package org.jboss.test.kernel.deployment.support.container;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 
 import org.jboss.logging.Logger;
@@ -63,11 +62,6 @@
       log.info("setInstance, bean: "+bean);
    }
 
-   
-   public HashMap<Class<?>, Object> getInterceptorInstances()
-   {
-      return null;
-   }
    public List<Object> getInterceptors()
    {
       return interceptorInstances;

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/BeanContextFactory.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/BeanContextFactory.java	2008-04-10 14:36:00 UTC (rev 71926)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/container/BeanContextFactory.java	2008-04-10 14:36:58 UTC (rev 71927)
@@ -158,7 +158,7 @@
             String iclass = interceptorNames.get(n);
             BeanMetaDataBuilder ibuilder = BeanMetaDataBuilder.createBuilder(iname, iclass);
             ibuilder.addInstallWithThis("addInterceptor", contextName);
-            ibuilder.addUninstall("removeInterceptor", contextName);
+            ibuilder.addUninstallWithThis("removeInterceptor", contextName);
             // Call the visitor to augment the metadata
             if(visitor != null)
                visitor.visit(contextBuilder, baseName, iCompName, compID);