X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=test%2Fenterprise%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fsupport%2Fjndi%2FStubInitialContext.java;h=e0fd8079fb8919e5d82a0ab6ff511747260f9149;hb=a48ae7f175655650b8b077236518977767ae63a4;hp=5300a8b6a5f230ca84ea375b28dcedd03723b50a;hpb=74a6cd5b71b4f668ddac54c3237511ee11e8d84e;p=utils

diff --git a/test/enterprise/src/main/java/org/wamblee/support/jndi/StubInitialContext.java b/test/enterprise/src/main/java/org/wamblee/support/jndi/StubInitialContext.java
index 5300a8b6..e0fd8079 100644
--- a/test/enterprise/src/main/java/org/wamblee/support/jndi/StubInitialContext.java
+++ b/test/enterprise/src/main/java/org/wamblee/support/jndi/StubInitialContext.java
@@ -23,7 +23,12 @@ import javax.naming.Name;
 import javax.naming.NameNotFoundException;
 import javax.naming.NamingException;
 
-public class StubInitialContext extends InitialContext {
+/**
+ * Initial context implementation. 
+ * 
+ * @author Erik Brakkee
+ */
+class StubInitialContext extends InitialContext {
     private Map<String, Object> bindings = new HashMap<String, Object>();
 
     public StubInitialContext() throws NamingException {
@@ -34,6 +39,11 @@ public class StubInitialContext extends InitialContext {
     public void bind(String aName, Object aObj) throws NamingException {
         bindings.put(aName, aObj);
     }
+    
+    @Override
+    public void unbind(String aName) throws NamingException {
+        bindings.remove(aName);
+    }
 
     @Override
     public Object lookup(String aName) throws NamingException {
@@ -43,13 +53,19 @@ public class StubInitialContext extends InitialContext {
         }
         return value;
     }
+    
+    @Override
+    public void bind(Name aName, Object aObj) throws NamingException {
+        bind(aName.toString(), aObj);
+    }
+    
+    @Override
+    public void unbind(Name aName) throws NamingException {
+        unbind(aName.toString());
+    }
 
     @Override
     public Object lookup(Name aName) throws NamingException {
-        Object value = super.lookup(aName.toString());
-        if (value == null) {
-            throw new NameNotFoundException(aName.toString());
-        }
-        return value;
+        return lookup(aName.toString());
     }
 }