equal
deleted
inserted
replaced
677 |
677 |
678 return (se); |
678 return (se); |
679 |
679 |
680 } catch (LdapReferralException e) { |
680 } catch (LdapReferralException e) { |
681 |
681 |
682 // %%% VR - setNameResolved(true); |
682 // %%% setNameResolved(true); |
683 |
683 |
684 // append (referrals from) the exception that generated this |
684 // append (referrals from) the exception that generated this |
685 // context to the new exception, so that referral processing |
685 // context to the new exception, so that referral processing |
686 // can continue |
686 // can continue |
687 |
687 |
895 return (urlName == null ? name : urlName); |
895 return (urlName == null ? name : urlName); |
896 } |
896 } |
897 |
897 |
898 /* |
898 /* |
899 * Use the attributes and scope components from the LDAP URL (if present) |
899 * Use the attributes and scope components from the LDAP URL (if present) |
900 * to override the corrpesonding components supplied in SearchControls. |
900 * to override the corresponding components supplied in SearchControls. |
901 */ |
901 */ |
902 private SearchControls overrideAttributesAndScope(SearchControls cons) { |
902 private SearchControls overrideAttributesAndScope(SearchControls cons) { |
903 SearchControls urlCons; |
903 SearchControls urlCons; |
904 |
904 |
905 if ((urlScope != null) || (urlAttrs != null)) { |
905 if ((urlScope != null) || (urlAttrs != null)) { |