src/share/classes/com/sun/jndi/ldap/LdapCtx.java

rev 10430 : imported patch typos

*** 1649,1659 ****
       * the one for the root of the DIT (by looking for the root's
       * "subschemasubentry" attribute).
       *
       * This function is called regardless of the server's version, since
       * an administrator may have setup the server to support client schema
!      * queries. If this function trys a serarch on a v2 server that
       * doesn't support schema, one of these two things will happen:
       * 1) It will get an exception when querying the root DSE
       * 2) It will not find a subschemasubentry on the root DSE
       * If either of these things occur and the server is not v3, we
       * throw OperationNotSupported.
--- 1649,1659 ----
       * the one for the root of the DIT (by looking for the root's
       * "subschemasubentry" attribute).
       *
       * This function is called regardless of the server's version, since
       * an administrator may have setup the server to support client schema
!      * queries. If this function tries a search on a v2 server that
       * doesn't support schema, one of these two things will happen:
       * 1) It will get an exception when querying the root DSE
       * 2) It will not find a subschemasubentry on the root DSE
       * If either of these things occur and the server is not v3, we
       * throw OperationNotSupported.
*** 2014,2024 ****
       *    - the scope is set to OBJECT_SCOPE
       *    - the filter string contains a simple assertion: "<type>=<value>"
       *    - the returning attributes list is present but empty
       */
  
!     // returns true if a search can be caried out as a compare, and sets
      // tokens[0] and tokens[1] to the type and value respectively.
      // e.g. filter "cn=Jon Ruiz" becomes, type "cn" and value "Jon Ruiz"
      // This function uses the documents JNDI Compare example as a model
      // for when to turn a search into a compare.
  
--- 2014,2024 ----
       *    - the scope is set to OBJECT_SCOPE
       *    - the filter string contains a simple assertion: "<type>=<value>"
       *    - the returning attributes list is present but empty
       */
  
!     // returns true if a search can be carried out as a compare, and sets
      // tokens[0] and tokens[1] to the type and value respectively.
      // e.g. filter "cn=Jon Ruiz" becomes, type "cn" and value "Jon Ruiz"
      // This function uses the documents JNDI Compare example as a model
      // for when to turn a search into a compare.
  
*** 2081,2091 ****
          } else if ((tokens[0].charAt(0) == '(') ||
              (tokens[1].charAt(len - 1) == ')')) {
              return false; // unbalanced
          }
  
!         // make sure the left and right half are not expresions themselves
          StringTokenizer illegalCharsTokenizer =
              new StringTokenizer(tokens[0], "()&|!=~><*", true);
  
          if (illegalCharsTokenizer.countTokens() != (hasParens ? 2 : 1)) {
              return false;
--- 2081,2091 ----
          } else if ((tokens[0].charAt(0) == '(') ||
              (tokens[1].charAt(len - 1) == ')')) {
              return false; // unbalanced
          }
  
!         // make sure the left and right half are not expressions themselves
          StringTokenizer illegalCharsTokenizer =
              new StringTokenizer(tokens[0], "()&|!=~><*", true);
  
          if (illegalCharsTokenizer.countTokens() != (hasParens ? 2 : 1)) {
              return false;
*** 2441,2451 ****
  
          } // else, leave alone; need not update
      }
  
      /**
!      * Set whether aliases are derefereced during resolution and searches.
       */
      private void setDerefAliases(String deref) {
          if (deref != null) {
              switch (deref) {
                  case "never":
--- 2441,2451 ----
  
          } // else, leave alone; need not update
      }
  
      /**
!      * Set whether aliases are dereferenced during resolution and searches.
       */
      private void setDerefAliases(String deref) {
          if (deref != null) {
              switch (deref) {
                  case "never":