DirCache: Fix getEntriesWithin("") to not include null entries

The internal array may be longer than entryCnt, in this case the tail
of the array is padded with null entries. Do not return those to the
caller of getEntriesWithin().

Change-Id: I19efb05e103fab6b739ced407f6e28155a48dba6
This commit is contained in:
Shawn Pearce 2015-11-27 21:34:16 -08:00
parent 46e4992e92
commit 885879ffe9
1 changed files with 2 additions and 2 deletions

View File

@ -877,8 +877,8 @@ public DirCacheEntry getEntry(final String path) {
*/
public DirCacheEntry[] getEntriesWithin(String path) {
if (path.length() == 0) {
final DirCacheEntry[] r = new DirCacheEntry[sortedEntries.length];
System.arraycopy(sortedEntries, 0, r, 0, sortedEntries.length);
DirCacheEntry[] r = new DirCacheEntry[entryCnt];
System.arraycopy(sortedEntries, 0, r, 0, entryCnt);
return r;
}
if (!path.endsWith("/")) //$NON-NLS-1$