codex-admin/autopsy
1
0
Fork 0
mirror of https://github.com/elisspace/autopsy.git synced 2026-09-29 13:59:52 +00:00
Code Issues Releases Wiki Activity

Added lock around access of properties to prevent exception during fast changes to table viewer

Browse Source
This commit is contained in:
Brian Carrier
2014-01-28 16:36:49 -05:00
parent 86c8b5e36c
commit 02b06d1a6d
1 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
+25 -12
View File
@@ -378,8 +378,14 @@ public class DataResultViewerTable extends AbstractDataResultViewer {
}
}
// Populate a two-dimensional array with rows of property values for up
// to maxRows children of the node passed in.
/**
* Create a 2-d array of rows (one per node) and columns (one per property) based on
* the passed in parent node.
*
* @param node Parent node
* @param maxRows Max rows to create
* @return Array of rows and columns
*/
private static Object[][] getRowValues(Node node, int maxRows) {
Object[][] rowValues = new Object[Math.min(maxRows, node.getChildren().getNodesCount())][];
int rowCount = 0;
@@ -388,16 +394,23 @@ public class DataResultViewerTable extends AbstractDataResultViewer {
break;
}
PropertySet[] propertySets = child.getPropertySets();
if (propertySets.length > 0)
{
Property[] properties = propertySets[0].getProperties();
rowValues[rowCount] = new Object[properties.length];
for (int j = 0; j < properties.length; ++j) {
try {
rowValues[rowCount][j] = properties[j].getValue();
}
catch (IllegalAccessException | InvocationTargetException ignore) {
rowValues[rowCount][j] = "n/a";
/* This lock was added because we saw an exception whereby the
* properties[j] access below was out of bounds when I was quickly
* scrolling down items in the tree and the result viewer was
* constantly updating.
*/
synchronized (propertySets) {
if (propertySets.length > 0) {
Property[] properties = propertySets[0].getProperties();
rowValues[rowCount] = new Object[properties.length];
for (int j = 0; j < properties.length; ++j) {
try {
rowValues[rowCount][j] = properties[j].getValue();
}
catch (IllegalAccessException | InvocationTargetException ignore) {
rowValues[rowCount][j] = "n/a";
}
}
}
}