src/share/classes/com/sun/jndi/toolkit/ctx/AtomicContext.java

*** 24,34 ****
   */
  
  package com.sun.jndi.toolkit.ctx;
  
  import javax.naming.*;
- import javax.naming.spi.ResolveResult;
  
  /**
    * Clients: deal only with names for its own naming service
    * and deals with single contexts that can be built up into
    * hierarchical naming systems.
--- 24,33 ----
*** 56,68 ****
      protected abstract Object a_lookup(String name, Continuation cont)
          throws NamingException;
      protected abstract Object a_lookupLink(String name, Continuation cont)
          throws NamingException;
  
!     protected abstract NamingEnumeration a_list(
          Continuation cont) throws NamingException;
!     protected abstract NamingEnumeration a_listBindings(
          Continuation cont) throws NamingException;
      protected abstract void a_bind(String name, Object obj, Continuation cont)
          throws NamingException;
      protected abstract void a_rebind(String name, Object obj, Continuation cont)
          throws NamingException;
--- 55,67 ----
      protected abstract Object a_lookup(String name, Continuation cont)
          throws NamingException;
      protected abstract Object a_lookupLink(String name, Continuation cont)
          throws NamingException;
  
!     protected abstract NamingEnumeration<NameClassPair> a_list(
          Continuation cont) throws NamingException;
!     protected abstract NamingEnumeration<Binding> a_listBindings(
          Continuation cont) throws NamingException;
      protected abstract void a_bind(String name, Object obj, Continuation cont)
          throws NamingException;
      protected abstract void a_rebind(String name, Object obj, Continuation cont)
          throws NamingException;
*** 191,206 ****
          throws NamingException {
              a_processJunction_nns(name, cont);
              return null;
          }
  
!     protected NamingEnumeration a_list_nns(Continuation cont)
          throws NamingException {
              a_processJunction_nns(cont);
              return null;
          }
!     protected NamingEnumeration a_listBindings_nns(Continuation cont)
          throws NamingException {
              a_processJunction_nns(cont);
              return null;
          }
  
--- 190,205 ----
          throws NamingException {
              a_processJunction_nns(name, cont);
              return null;
          }
  
!     protected NamingEnumeration<NameClassPair> a_list_nns(Continuation cont)
          throws NamingException {
              a_processJunction_nns(cont);
              return null;
          }
!     protected NamingEnumeration<Binding> a_listBindings_nns(Continuation cont)
          throws NamingException {
              a_processJunction_nns(cont);
              return null;
          }
  
*** 271,289 ****
                  return a_lookupLink(name.toString(), cont);
              }
              return null;
          }
  
!     protected NamingEnumeration c_list(Name name,
          Continuation cont) throws NamingException {
              if (resolve_to_context(name, cont)) {
                  return a_list(cont);
              }
              return null;
          }
  
!     protected NamingEnumeration c_listBindings(Name name,
          Continuation cont) throws NamingException {
              if (resolve_to_context(name, cont)) {
                  return a_listBindings(cont);
              }
              return null;
--- 270,288 ----
                  return a_lookupLink(name.toString(), cont);
              }
              return null;
          }
  
!     protected NamingEnumeration<NameClassPair> c_list(Name name,
          Continuation cont) throws NamingException {
              if (resolve_to_context(name, cont)) {
                  return a_list(cont);
              }
              return null;
          }
  
!     protected NamingEnumeration<Binding> c_listBindings(Name name,
          Continuation cont) throws NamingException {
              if (resolve_to_context(name, cont)) {
                  return a_listBindings(cont);
              }
              return null;
*** 390,418 ****
                  // use ComponentContext
                  return super.c_lookupLink_nns(name, cont);
              }
          }
  
!     protected NamingEnumeration c_list_nns(Name name,
          Continuation cont) throws NamingException {
              if (_contextType == _ATOMIC) {
                  resolve_to_nns_and_continue(name, cont);
                  return null;
              } else {
                  // use ComponentContext
                  return super.c_list_nns(name, cont);
              }
          }
  
!     protected NamingEnumeration c_listBindings_nns(Name name,
          Continuation cont) throws NamingException {
              if (_contextType == _ATOMIC) {
                  resolve_to_nns_and_continue(name, cont);
                  return null;
              } else {
                  // use ComponentContext
!                 return super.c_list_nns(name, cont);
              }
          }
  
      protected void c_bind_nns(Name name, Object obj, Continuation cont)
          throws NamingException {
--- 389,417 ----
                  // use ComponentContext
                  return super.c_lookupLink_nns(name, cont);
              }
          }
  
!     protected NamingEnumeration<NameClassPair> c_list_nns(Name name,
          Continuation cont) throws NamingException {
              if (_contextType == _ATOMIC) {
                  resolve_to_nns_and_continue(name, cont);
                  return null;
              } else {
                  // use ComponentContext
                  return super.c_list_nns(name, cont);
              }
          }
  
!     protected NamingEnumeration<Binding> c_listBindings_nns(Name name,
          Continuation cont) throws NamingException {
              if (_contextType == _ATOMIC) {
                  resolve_to_nns_and_continue(name, cont);
                  return null;
              } else {
                  // use ComponentContext
!                 return super.c_listBindings_nns(name, cont);
              }
          }
  
      protected void c_bind_nns(Name name, Object obj, Continuation cont)
          throws NamingException {