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

*** 26,37 ****
  package com.sun.jndi.toolkit.ctx;
  
  import javax.naming.*;
  import javax.naming.directory.*;
  
- import javax.naming.spi.ResolveResult;
- 
  /* Direct subclasses of ComponentDirContext must provide implementations for
   * the abstract c_ DirContext methods, and override the c_ Context methods
   * (which are no longer abstract because they have been overriden by
   * AtomicContext, the direct superclass of PartialDSCompositeContext).
   *
--- 26,35 ----
*** 79,101 ****
      protected abstract DirContext c_createSubcontext(Name name,
                                                      Attributes attrs,
                                                      Continuation cont)
          throws NamingException;
  
!     protected abstract NamingEnumeration c_search(Name name,
                                                 Attributes matchingAttributes,
                                                 String[] attributesToReturn,
                                                 Continuation cont)
          throws NamingException;
  
!     protected abstract NamingEnumeration c_search(Name name,
                                                 String filter,
                                                 SearchControls cons,
                                                 Continuation cont)
          throws NamingException;
  
!     protected abstract NamingEnumeration c_search(Name name,
                                                    String filterExpr,
                                                    Object[] filterArgs,
                                                    SearchControls cons,
                                                    Continuation cont)
          throws NamingException;
--- 77,102 ----
      protected abstract DirContext c_createSubcontext(Name name,
                                                      Attributes attrs,
                                                      Continuation cont)
          throws NamingException;
  
!     protected abstract NamingEnumeration<SearchResult> c_search(
!                             Name name,
                              Attributes matchingAttributes,
                              String[] attributesToReturn,
                              Continuation cont)
          throws NamingException;
  
!     protected abstract NamingEnumeration<SearchResult> c_search(
!                             Name name,
                              String filter,
                              SearchControls cons,
                              Continuation cont)
          throws NamingException;
  
!     protected abstract NamingEnumeration<SearchResult> c_search(
!                             Name name,
                              String filterExpr,
                              Object[] filterArgs,
                              SearchControls cons,
                              Continuation cont)
          throws NamingException;
*** 170,198 ****
          throws NamingException  {
              c_processJunction_nns(name, cont);
              return null;
          }
  
!     protected NamingEnumeration c_search_nns(Name name,
                                            Attributes matchingAttributes,
                                            String[] attributesToReturn,
                                            Continuation cont)
          throws NamingException {
              c_processJunction_nns(name, cont);
              return null;
          }
  
!     protected NamingEnumeration c_search_nns(Name name,
                                            String filter,
                                            SearchControls cons,
                                            Continuation cont)
          throws NamingException  {
              c_processJunction_nns(name, cont);
              return null;
          }
  
!     protected NamingEnumeration c_search_nns(Name name,
                                               String filterExpr,
                                               Object[] filterArgs,
                                               SearchControls cons,
                                               Continuation cont)
          throws NamingException  {
--- 171,202 ----
          throws NamingException  {
              c_processJunction_nns(name, cont);
              return null;
          }
  
!     protected NamingEnumeration<SearchResult> c_search_nns(
!                         Name name,
                          Attributes matchingAttributes,
                          String[] attributesToReturn,
                          Continuation cont)
          throws NamingException {
              c_processJunction_nns(name, cont);
              return null;
          }
  
!     protected NamingEnumeration<SearchResult> c_search_nns(
!                         Name name,
                          String filter,
                          SearchControls cons,
                          Continuation cont)
          throws NamingException  {
              c_processJunction_nns(name, cont);
              return null;
          }
  
!     protected NamingEnumeration<SearchResult> c_search_nns(
!                         Name name,
                          String filterExpr,
                          Object[] filterArgs,
                          SearchControls cons,
                          Continuation cont)
          throws NamingException  {
*** 343,359 ****
                  break;
              }
          return answer;
      }
  
!     protected NamingEnumeration p_search(Name name,
                                        Attributes matchingAttributes,
                                        String[] attributesToReturn,
                                        Continuation cont)
          throws NamingException {
          HeadTail res = p_resolveIntermediate(name, cont);
!         NamingEnumeration answer = null;
          switch (res.getStatus()) {
              case TERMINAL_NNS_COMPONENT:
                  answer = c_search_nns(res.getHead(), matchingAttributes,
                                        attributesToReturn, cont);
                  break;
--- 347,364 ----
                  break;
              }
          return answer;
      }
  
!     protected NamingEnumeration<SearchResult> p_search(
!                     Name name,
                      Attributes matchingAttributes,
                      String[] attributesToReturn,
                      Continuation cont)
          throws NamingException {
          HeadTail res = p_resolveIntermediate(name, cont);
!         NamingEnumeration<SearchResult> answer = null;
          switch (res.getStatus()) {
              case TERMINAL_NNS_COMPONENT:
                  answer = c_search_nns(res.getHead(), matchingAttributes,
                                        attributesToReturn, cont);
                  break;
*** 369,384 ****
                  break;
              }
          return answer;
      }
  
!     protected NamingEnumeration p_search(Name name,
                                        String filter,
!                                       SearchControls cons, Continuation cont)
          throws NamingException {
          HeadTail res = p_resolveIntermediate(name, cont);
!         NamingEnumeration answer = null;
          switch (res.getStatus()) {
              case TERMINAL_NNS_COMPONENT:
                  answer = c_search_nns(res.getHead(), filter, cons, cont);
                  break;
  
--- 374,390 ----
                  break;
              }
          return answer;
      }
  
!     protected NamingEnumeration<SearchResult> p_search(Name name,
                                                         String filter,
!                                                        SearchControls cons,
!                                                        Continuation cont)
          throws NamingException {
          HeadTail res = p_resolveIntermediate(name, cont);
!         NamingEnumeration<SearchResult> answer = null;
          switch (res.getStatus()) {
              case TERMINAL_NNS_COMPONENT:
                  answer = c_search_nns(res.getHead(), filter, cons, cont);
                  break;
  
*** 392,409 ****
                  break;
              }
          return answer;
      }
  
!     protected NamingEnumeration p_search(Name name,
                                           String filterExpr,
                                           Object[] filterArgs,
                                           SearchControls cons,
                                           Continuation cont)
              throws NamingException {
          HeadTail res = p_resolveIntermediate(name, cont);
!         NamingEnumeration answer = null;
          switch (res.getStatus()) {
              case TERMINAL_NNS_COMPONENT:
                  answer = c_search_nns(res.getHead(),
                                        filterExpr, filterArgs, cons, cont);
                  break;
--- 398,415 ----
                  break;
              }
          return answer;
      }
  
!     protected NamingEnumeration<SearchResult> p_search(Name name,
                                                         String filterExpr,
                                                         Object[] filterArgs,
                                                         SearchControls cons,
                                                         Continuation cont)
              throws NamingException {
          HeadTail res = p_resolveIntermediate(name, cont);
!         NamingEnumeration<SearchResult> answer = null;
          switch (res.getStatus()) {
              case TERMINAL_NNS_COMPONENT:
                  answer = c_search_nns(res.getHead(),
                                        filterExpr, filterArgs, cons, cont);
                  break;