Bug 23950

I believe that the Context.listBindings(...) methods should return an
Enumeration that returns resolved Objects, not references.  The current
implementation does not make an effort to resolve References to Objects prior to
returning the Binding.  It also should hold Exceptions until the enumeration has
been fully traversed.  A possible patch is noted below (verified against 1.4,
spot-checked for pre-1.4).


Index: NamingContextBindingsEnumeration.java
===================================================================
RCS file:
/home/cvspublic/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/NamingContextBindingsEnumeration.java,v
retrieving revision 1.1
diff -u -r1.1 NamingContextBindingsEnumeration.java
--- NamingContextBindingsEnumeration.java	2 Nov 2000 06:14:16 -0000	1.1
+++ NamingContextBindingsEnumeration.java	20 Oct 2003 14:58:28 -0000
@@ -67,9 +67,12 @@
 import java.util.Hashtable;
 import java.util.Vector;
 import java.util.Enumeration;
+import javax.naming.CompositeName;
+import javax.naming.Context;
 import javax.naming.NamingException;
 import javax.naming.NamingEnumeration;
 import javax.naming.Binding;
+import javax.naming.spi.NamingManager;
 
 /**
  * Naming enumeration implementation.
@@ -85,13 +88,17 @@
     // ----------------------------------------------------------- Constructors
 
 
-    public NamingContextBindingsEnumeration(Vector entries) {
+    public NamingContextBindingsEnumeration(Vector entries, Context ctx,
Hashtable env) {
         enum = entries.elements();
+		this.ctx = ctx;
+		this.env = env;
     }
 
 
-    public NamingContextBindingsEnumeration(Enumeration enum) {
+    public NamingContextBindingsEnumeration(Enumeration enum, Context ctx,
Hashtable env) {
         this.enum = enum;
+		this.ctx = ctx;
+		this.env = env;
     }
 
 
@@ -103,6 +110,11 @@
      */
     protected Enumeration enum;
 
+    private Hashtable env;
+    private Context ctx;
+    private Binding next;
+    private Exception trouble;
+    private boolean runtimeExc;
 
     // --------------------------------------------------------- Public Methods
 
@@ -110,9 +122,10 @@
     /**
      * Retrieves the next element in the enumeration.
      */
-    public Object next()
-        throws NamingException {
-        return nextElement();
+    public Object next() {
+		Object ret = next;
+		next = null;
+		return ret;
     }
 
 
@@ -121,7 +134,35 @@
      */
     public boolean hasMore()
         throws NamingException {
-        return enum.hasMoreElements();
+		if (next != null) {
+			return true;
+		}
+		if (enum.hasMoreElements()) {
+			try {
+				NamingEntry entry = (NamingEntry)enum.nextElement();
+				String name = entry.name;
+				Object obj = NamingManager.getObjectInstance(entry.value, new
CompositeName(name), ctx, env);
+				next = new Binding(name, entry.value.getClass().getName(), obj, true);
+				return true;
+			} catch (NamingException e) {
+				trouble = e;
+			} catch (RuntimeException e) {
+				trouble = e;
+				runtimeExc = true;
+			} catch (Exception e) {
+				NamingException ne = new NamingException();
+				ne.setRootCause(e);
+				trouble = ne;
+			}
+		}
+		if (trouble != null) {
+			if (runtimeExc) {
+				throw (RuntimeException)trouble;
+			} else {
+				throw (NamingException)trouble;
+			}
+		}
+		return false;
     }
 
 
@@ -133,16 +174,17 @@
     }
 
 
-    public boolean hasMoreElements() {
-        return enum.hasMoreElements();
-    }
-
-
-    public Object nextElement() {
-        NamingEntry entry = (NamingEntry) enum.nextElement();
-        return new Binding(entry.name, entry.value.getClass().getName(), 
-                           entry.value, true);
-    }
+	public boolean hasMoreElements() {
+		try {
+			return hasMore();
+		} catch (NamingException e) {
+			return false;
+		}
+	}
+
+	public Object nextElement() {
+		return next();
+	}
 
 
 }
Index: NamingContext.java
===================================================================
RCS file:
/home/cvspublic/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/NamingContext.java,v
retrieving revision 1.8
diff -u -r1.8 NamingContext.java
--- NamingContext.java	8 Nov 2001 21:02:04 -0000	1.8
+++ NamingContext.java	20 Oct 2003 14:58:38 -0000
@@ -429,7 +429,7 @@
         while ((!name.isEmpty()) && (name.get(0).length() == 0))
             name = name.getSuffix(1);
         if (name.isEmpty()) {
-            return new NamingContextBindingsEnumeration(bindings.elements());
+            return new NamingContextBindingsEnumeration(bindings.elements(),
this, env);
         }
         
         NamingEntry entry = (NamingEntry) bindings.get(name.get(0));
Index: resources/FileDirContext.java
===================================================================
RCS file:
/home/cvspublic/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/FileDirContext.java,v
retrieving revision 1.15
diff -u -r1.15 FileDirContext.java
--- resources/FileDirContext.java	6 Nov 2002 09:57:17 -0000	1.15
+++ resources/FileDirContext.java	20 Oct 2003 14:59:01 -0000
@@ -389,7 +389,7 @@
 
         Vector entries = list(file);
 
-        return new NamingContextBindingsEnumeration(entries);
+        return new NamingContextBindingsEnumeration(entries, this, env);
 
     }
 
Index: resources/WARDirContext.java
===================================================================
RCS file:
/home/cvspublic/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/WARDirContext.java,v
retrieving revision 1.5
diff -u -r1.5 WARDirContext.java
--- resources/WARDirContext.java	28 Feb 2002 07:04:36 -0000	1.5
+++ resources/WARDirContext.java	20 Oct 2003 14:59:10 -0000
@@ -374,12 +374,12 @@
     public NamingEnumeration listBindings(Name name)
         throws NamingException {
         if (name.isEmpty())
-            return new NamingContextBindingsEnumeration(list(entries));
+            return new NamingContextBindingsEnumeration(list(entries), this, env);
         Entry entry = treeLookup(name);
         if (entry == null)
             throw new NamingException
                 (sm.getString("resources.notFound", name));
-        return new NamingContextBindingsEnumeration(list(entry));
+        return new NamingContextBindingsEnumeration(list(entry), this, env);
     }