equal
deleted
inserted
replaced
913 */ |
913 */ |
914 private static Attributes addRdnAttributes(String dn, Attributes attrs, |
914 private static Attributes addRdnAttributes(String dn, Attributes attrs, |
915 boolean directUpdate) throws NamingException { |
915 boolean directUpdate) throws NamingException { |
916 |
916 |
917 // Handle the empty name |
917 // Handle the empty name |
918 if (dn.equals("")) { |
918 if (dn.isEmpty()) { |
919 return attrs; |
919 return attrs; |
920 } |
920 } |
921 |
921 |
922 // Parse string name into list of RDNs |
922 // Parse string name into list of RDNs |
923 List<Rdn> rdnList = (new LdapName(dn)).getRdns(); |
923 List<Rdn> rdnList = (new LdapName(dn)).getRdns(); |
1269 } |
1269 } |
1270 |
1270 |
1271 int prefixLast = prefix.size() - 1; |
1271 int prefixLast = prefix.size() - 1; |
1272 |
1272 |
1273 if (name.isEmpty() || prefix.isEmpty() || |
1273 if (name.isEmpty() || prefix.isEmpty() || |
1274 name.get(0).equals("") || prefix.get(prefixLast).equals("")) { |
1274 name.get(0).isEmpty() || prefix.get(prefixLast).isEmpty()) { |
1275 return super.composeName(name, prefix); |
1275 return super.composeName(name, prefix); |
1276 } |
1276 } |
1277 |
1277 |
1278 result = (Name)(prefix.clone()); |
1278 result = (Name)(prefix.clone()); |
1279 result.addAll(name); |
1279 result.addAll(name); |
1298 return (concatNames(rel, currentDN)); |
1298 return (concatNames(rel, currentDN)); |
1299 } |
1299 } |
1300 |
1300 |
1301 // used by LdapSearchEnumeration |
1301 // used by LdapSearchEnumeration |
1302 private static String concatNames(String lesser, String greater) { |
1302 private static String concatNames(String lesser, String greater) { |
1303 if (lesser == null || lesser.equals("")) { |
1303 if (lesser == null || lesser.isEmpty()) { |
1304 return greater; |
1304 return greater; |
1305 } else if (greater == null || greater.equals("")) { |
1305 } else if (greater == null || greater.isEmpty()) { |
1306 return lesser; |
1306 return lesser; |
1307 } else { |
1307 } else { |
1308 return (lesser + "," + greater); |
1308 return (lesser + "," + greater); |
1309 } |
1309 } |
1310 } |
1310 } |
3034 e = new PartialResultException(msg); |
3034 e = new PartialResultException(msg); |
3035 break; |
3035 break; |
3036 } |
3036 } |
3037 |
3037 |
3038 // extract SLAPD-style referrals from errorMessage |
3038 // extract SLAPD-style referrals from errorMessage |
3039 if ((res.errorMessage != null) && (!res.errorMessage.equals(""))) { |
3039 if ((res.errorMessage != null) && (!res.errorMessage.isEmpty())) { |
3040 res.referrals = extractURLs(res.errorMessage); |
3040 res.referrals = extractURLs(res.errorMessage); |
3041 } else { |
3041 } else { |
3042 e = new PartialResultException(msg); |
3042 e = new PartialResultException(msg); |
3043 break; |
3043 break; |
3044 } |
3044 } |