Skip to content

Commit d15adf0

Browse files
authored
Remove redundant code in DirectorySearcher (dotnet/corefx#40321)
Commit migrated from dotnet/corefx@f7ecc21
1 parent 311c286 commit d15adf0

File tree

1 file changed

+4
-14
lines changed

1 file changed

+4
-14
lines changed

src/libraries/System.DirectoryServices/src/System/DirectoryServices/DirectorySearcher.cs

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -623,17 +623,7 @@ public SearchResult FindOne()
623623

624624
private SearchResultCollection FindAll(bool findMoreThanOne)
625625
{
626-
searchResult = null;
627-
628-
DirectoryEntry clonedRoot = null;
629-
if (_assertDefaultNamingContext == null)
630-
{
631-
clonedRoot = SearchRoot.CloneBrowsable();
632-
}
633-
else
634-
{
635-
clonedRoot = SearchRoot.CloneBrowsable();
636-
}
626+
DirectoryEntry clonedRoot = SearchRoot.CloneBrowsable();
637627

638628
UnsafeNativeMethods.IAds adsObject = clonedRoot.AdsObject;
639629
if (!(adsObject is UnsafeNativeMethods.IDirectorySearch))
@@ -667,16 +657,16 @@ private SearchResultCollection FindAll(bool findMoreThanOne)
667657

668658
IntPtr resultsHandle;
669659
if (properties != null)
660+
{
670661
adsSearch.ExecuteSearch(Filter, properties, properties.Length, out resultsHandle);
662+
}
671663
else
672664
{
673665
adsSearch.ExecuteSearch(Filter, null, -1, out resultsHandle);
674666
properties = Array.Empty<string>();
675667
}
676668

677-
SearchResultCollection result = new SearchResultCollection(clonedRoot, resultsHandle, properties, this);
678-
searchResult = result;
679-
return result;
669+
return new SearchResultCollection(clonedRoot, resultsHandle, properties, this);
680670
}
681671

682672
private unsafe void SetSearchPreferences(UnsafeNativeMethods.IDirectorySearch adsSearch, bool findMoreThanOne)

0 commit comments

Comments
 (0)