mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-20 11:26:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Return empty lists instead of null to prevent null pointer exception happening in Collections.sort()

Browse Source
This commit is contained in:
Eamonn Saunders 2015-05-29 14:05:09 -04:00
parent a949403cb2
commit 20ef8d397f
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Core/src/org/sleuthkit/autopsy/directorytree/ExtractUnallocAction.java
View File

@ -178,7 +178,7 @@ import org.sleuthkit.datamodel.VolumeSystem;
} catch (TskCoreException tce) {
logger.log(Level.WARNING, "Couldn't get a list of Unallocated Files, failed at sending out the visitor ", tce); //NON-NLS
}
return null;
return Collections.emptyList();
}
/**
@ -372,7 +372,7 @@ import org.sleuthkit.datamodel.VolumeSystem;
* return the single instance of unallocated space.
*
* @param lf the LayoutFile the visitor encountered
* @return A list<LayoutFile> of size 1, returns null if it fails
* @return A list<LayoutFile> of size 1
*/
@Override
public List<LayoutFile> visit(final org.sleuthkit.datamodel.LayoutFile lf) {
@ -389,7 +389,7 @@ import org.sleuthkit.datamodel.VolumeSystem;
*
* @param fs the FileSystem the visitor encountered
* @return A list<LayoutFile> containing the layout files from
* subsequent Visits(), returns null if it fails
* subsequent Visits(), or an empty list
*/
@Override
public List<LayoutFile> visit(FileSystem fs) {
@ -402,7 +402,7 @@ import org.sleuthkit.datamodel.VolumeSystem;
} catch (TskCoreException tce) {
logger.log(Level.WARNING, "Couldn't get a list of Unallocated Files, failed at visiting FileSystem " + fs.getId(), tce); //NON-NLS
}
return null;
return Collections.emptyList();
}
/**
@ -410,12 +410,12 @@ import org.sleuthkit.datamodel.VolumeSystem;
*
* @param vd VirtualDirectory the visitor encountered
* @return A list<LayoutFile> containing all the LayoutFile in ld,
* returns null if it fails
* or an empty list.
*/
@Override
public List<LayoutFile> visit(VirtualDirectory vd) {
try {
List<LayoutFile> lflst = new ArrayList<LayoutFile>();
List<LayoutFile> lflst = new ArrayList<>();
for (Content layout : vd.getChildren()) {
lflst.add((LayoutFile) layout);
}
@ -423,7 +423,7 @@ import org.sleuthkit.datamodel.VolumeSystem;
} catch (TskCoreException tce) {
logger.log(Level.WARNING, "Could not get list of Layout Files, failed at visiting Layout Directory", tce); //NON-NLS
}
return null;
return Collections.emptyList();
}
/**
@ -432,7 +432,7 @@ import org.sleuthkit.datamodel.VolumeSystem;
*
* @param dir the directory this visitor encountered
* @return A list<LayoutFile> containing LayoutFiles encountered during
* subsequent Visits(), returns null if it fails
* subsequent Visits(), or an empty list.
*/
@Override
public List<LayoutFile> visit(Directory dir) {
@ -445,12 +445,12 @@ import org.sleuthkit.datamodel.VolumeSystem;
} catch (TskCoreException tce) {
logger.log(Level.WARNING, "Couldn't get a list of Unallocated Files, failed at visiting Directory " + dir.getId(), tce); //NON-NLS
}
return null;
return Collections.emptyList();
}
@Override
protected List<LayoutFile> defaultVisit(Content cntnt) {
return null;
return Collections.emptyList();
}
}