Now working with both hibernate and eclipselink

[utils] / test / enterprise / src / main / java / org / wamblee / support / jndi / StubInitialContext.java

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 05dd30378a98da0fd2b28199d10af5403ae80921..5300a8b6a5f230ca84ea375b28dcedd03723b50a 100644 (file)
--- a/test/enterprise/src/main/java/org/wamblee/support/jndi/StubInitialContext.java
+++ b/test/enterprise/src/main/java/org/wamblee/support/jndi/StubInitialContext.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2005-2010 the original author or authors.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.wamblee.support.jndi;
 
 import java.util.HashMap;
@@ -5,6 +20,7 @@ import java.util.Map;
 
 import javax.naming.InitialContext;
 import javax.naming.Name;
+import javax.naming.NameNotFoundException;
 import javax.naming.NamingException;
 
 public class StubInitialContext extends InitialContext {
@@ -15,17 +31,25 @@ public class StubInitialContext extends InitialContext {
     }
 
     @Override
-    public void bind(String name, Object obj) throws NamingException {
-        bindings.put(name, obj);
+    public void bind(String aName, Object aObj) throws NamingException {
+        bindings.put(aName, aObj);
     }
 
     @Override
-    public Object lookup(String name) throws NamingException {
-        return bindings.get(name);
+    public Object lookup(String aName) throws NamingException {
+        Object value = bindings.get(aName);
+        if (value == null) {
+            throw new NameNotFoundException(aName);
+        }
+        return value;
     }
 
     @Override
-    public Object lookup(Name name) throws NamingException {
-        return super.lookup(name.toString());
+    public Object lookup(Name aName) throws NamingException {
+        Object value = super.lookup(aName.toString());
+        if (value == null) {
+            throw new NameNotFoundException(aName.toString());
+        }
+        return value;
     }
 }