Author: nfilotto
Date: 2010-09-29 04:47:40 -0400 (Wed, 29 Sep 2010)
New Revision: 3215
Modified:
kernel/branches/2.2.x/exo.kernel.container/src/main/java/org/exoplatform/container/CachingContainer.java
kernel/branches/2.2.x/exo.kernel.container/src/test/java/org/exoplatform/container/TestExoContainer.java
Log:
KER-163: Bug with the CachingContainer has been fixed
Modified:
kernel/branches/2.2.x/exo.kernel.container/src/main/java/org/exoplatform/container/CachingContainer.java
===================================================================
---
kernel/branches/2.2.x/exo.kernel.container/src/main/java/org/exoplatform/container/CachingContainer.java 2010-09-29
08:34:52 UTC (rev 3214)
+++
kernel/branches/2.2.x/exo.kernel.container/src/main/java/org/exoplatform/container/CachingContainer.java 2010-09-29
08:47:40 UTC (rev 3215)
@@ -155,7 +155,7 @@
caching.adapterByType.clear();
caching.adaptersByType.clear();
caching.instanceByKey.clear();
- caching.adaptersByType.clear();
+ caching.instanceByType.clear();
caching.instancesByType.clear();
}
}
Modified:
kernel/branches/2.2.x/exo.kernel.container/src/test/java/org/exoplatform/container/TestExoContainer.java
===================================================================
---
kernel/branches/2.2.x/exo.kernel.container/src/test/java/org/exoplatform/container/TestExoContainer.java 2010-09-29
08:34:52 UTC (rev 3214)
+++
kernel/branches/2.2.x/exo.kernel.container/src/test/java/org/exoplatform/container/TestExoContainer.java 2010-09-29
08:47:40 UTC (rev 3215)
@@ -44,6 +44,28 @@
public class TestExoContainer extends AbstractTestContainer
{
+ public class CachedComponent
+ {
+ public CachedComponent()
+ {
+ }
+
+ public int hash()
+ {
+ return this.hashCode();
+ }
+ }
+
+ public void testRemoveComponent() throws Exception
+ {
+ RootContainer container = RootContainer.getInstance();
+ container.registerComponentInstance(new CachedComponent());
+
+ assertNotNull(container.getComponentInstanceOfType(CachedComponent.class));
+ container.unregisterComponent(CachedComponent.class);
+ assertNull(container.getComponentInstanceOfType(CachedComponent.class));
+ }
+
public void testContainerLifecyclePlugin()
{
final RootContainer container =
createRootContainer("test-exo-container.xml");