[jboss-cvs] JBossAS SVN: r58377 - projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/jndi

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

Author: scott.stark at jboss.org
Date: 2006-11-15 01:11:51 -0500 (Wed, 15 Nov 2006)
New Revision: 58377

Modified:
   projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/jndi/MockJndiProvider.java
Log:
serialize the bindings to validate the behavior of the aop proxy.

Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/jndi/MockJndiProvider.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/jndi/MockJndiProvider.java	2006-11-15 04:11:13 UTC (rev 58376)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/jndi/MockJndiProvider.java	2006-11-15 06:11:51 UTC (rev 58377)
@@ -21,6 +21,8 @@
  */
 package org.jboss.test.microcontainer.support.jndi;
 
+import java.io.IOException;
+import java.rmi.MarshalledObject;
 import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.concurrent.ConcurrentHashMap;
@@ -58,7 +60,17 @@
    }
    public void bind(String name, Object obj) throws NamingException
    {
-      bindings.put(name, obj);
+      try
+      {
+         MarshalledObject mo = new MarshalledObject(obj);
+         bindings.put(name, mo);
+      }
+      catch(IOException e)
+      {
+         NamingException ex = new NamingException("Failed to bind name: "+name);
+         ex.setRootCause(e);
+         throw ex;
+      }
    }
    public void close() throws NamingException
    {
@@ -139,7 +151,21 @@
    }
    public Object lookup(String name) throws NamingException
    {
-      Object value = bindings.get(name);
+      MarshalledObject mo = (MarshalledObject) bindings.get(name);
+      Object value = null;
+      if( mo != null )
+      {
+         try
+         {
+            value = mo.get();
+         }
+         catch(Exception e)
+         {
+            NamingException ex = new NamingException();
+            ex.setRootCause(e);
+            throw ex;
+         }
+      }
       return value;
    }
    public Object lookupLink(Name name) throws NamingException