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

rev 52881 : 8214971: Replace use of string.equals("") with isEmpty()
Reviewed-by: jlaskey, prappo, lancea, dfuchs, redestad

*** 913,923 ****
       */
      private static Attributes addRdnAttributes(String dn, Attributes attrs,
          boolean directUpdate) throws NamingException {
  
              // Handle the empty name
!             if (dn.equals("")) {
                  return attrs;
              }
  
              // Parse string name into list of RDNs
              List<Rdn> rdnList = (new LdapName(dn)).getRdns();
--- 913,923 ----
       */
      private static Attributes addRdnAttributes(String dn, Attributes attrs,
          boolean directUpdate) throws NamingException {
  
              // Handle the empty name
!             if (dn.isEmpty()) {
                  return attrs;
              }
  
              // Parse string name into list of RDNs
              List<Rdn> rdnList = (new LdapName(dn)).getRdns();
*** 1269,1279 ****
          }
  
          int prefixLast = prefix.size() - 1;
  
          if (name.isEmpty() || prefix.isEmpty() ||
!                 name.get(0).equals("") || prefix.get(prefixLast).equals("")) {
              return super.composeName(name, prefix);
          }
  
          result = (Name)(prefix.clone());
          result.addAll(name);
--- 1269,1279 ----
          }
  
          int prefixLast = prefix.size() - 1;
  
          if (name.isEmpty() || prefix.isEmpty() ||
!                 name.get(0).isEmpty() || prefix.get(prefixLast).isEmpty()) {
              return super.composeName(name, prefix);
          }
  
          result = (Name)(prefix.clone());
          result.addAll(name);
*** 1298,1310 ****
          return (concatNames(rel, currentDN));
      }
  
      // used by LdapSearchEnumeration
      private static String concatNames(String lesser, String greater) {
!         if (lesser == null || lesser.equals("")) {
              return greater;
!         } else if (greater == null || greater.equals("")) {
              return lesser;
          } else {
              return (lesser + "," + greater);
          }
      }
--- 1298,1310 ----
          return (concatNames(rel, currentDN));
      }
  
      // used by LdapSearchEnumeration
      private static String concatNames(String lesser, String greater) {
!         if (lesser == null || lesser.isEmpty()) {
              return greater;
!         } else if (greater == null || greater.isEmpty()) {
              return lesser;
          } else {
              return (lesser + "," + greater);
          }
      }
*** 3034,3044 ****
                  e = new PartialResultException(msg);
                  break;
              }
  
              // extract SLAPD-style referrals from errorMessage
!             if ((res.errorMessage != null) && (!res.errorMessage.equals(""))) {
                  res.referrals = extractURLs(res.errorMessage);
              } else {
                  e = new PartialResultException(msg);
                  break;
              }
--- 3034,3044 ----
                  e = new PartialResultException(msg);
                  break;
              }
  
              // extract SLAPD-style referrals from errorMessage
!             if ((res.errorMessage != null) && (!res.errorMessage.isEmpty())) {
                  res.referrals = extractURLs(res.errorMessage);
              } else {
                  e = new PartialResultException(msg);
                  break;
              }