src/share/classes/com/sun/jndi/toolkit/dir/DirSearch.java

*** 32,42 ****
    * A class for searching DirContexts
    *
    * @author Jon Ruiz
    */
  public class DirSearch {
!    public static NamingEnumeration search(DirContext ctx,
         Attributes matchingAttributes,
         String[] attributesToReturn) throws NamingException {
          SearchControls cons = new SearchControls(
              SearchControls.ONELEVEL_SCOPE,
              0, 0, attributesToReturn,
--- 32,42 ----
    * A class for searching DirContexts
    *
    * @author Jon Ruiz
    */
  public class DirSearch {
!    public static NamingEnumeration<SearchResult> search(DirContext ctx,
         Attributes matchingAttributes,
         String[] attributesToReturn) throws NamingException {
          SearchControls cons = new SearchControls(
              SearchControls.ONELEVEL_SCOPE,
              0, 0, attributesToReturn,
*** 46,56 ****
              new ContextEnumerator(ctx, SearchControls.ONELEVEL_SCOPE),
              new ContainmentFilter(matchingAttributes),
              cons);
      }
  
!     public static NamingEnumeration search(DirContext ctx,
          String filter, SearchControls cons) throws NamingException {
  
          if (cons == null)
              cons = new SearchControls();
  
--- 46,56 ----
              new ContextEnumerator(ctx, SearchControls.ONELEVEL_SCOPE),
              new ContainmentFilter(matchingAttributes),
              cons);
      }
  
!     public static NamingEnumeration<SearchResult> search(DirContext ctx,
          String filter, SearchControls cons) throws NamingException {
  
          if (cons == null)
              cons = new SearchControls();
  
*** 58,68 ****
              new ContextEnumerator(ctx, cons.getSearchScope()),
              new SearchFilter(filter),
              cons);
      }
  
!     public static NamingEnumeration search(DirContext ctx,
          String filterExpr, Object[] filterArgs, SearchControls cons)
          throws NamingException {
  
          String strfilter = SearchFilter.format(filterExpr, filterArgs);
          return search(ctx, strfilter, cons);
--- 58,68 ----
              new ContextEnumerator(ctx, cons.getSearchScope()),
              new SearchFilter(filter),
              cons);
      }
  
!     public static NamingEnumeration<SearchResult> search(DirContext ctx,
          String filterExpr, Object[] filterArgs, SearchControls cons)
          throws NamingException {
  
          String strfilter = SearchFilter.format(filterExpr, filterArgs);
          return search(ctx, strfilter, cons);