Merge pull request #6855 from kellykelly3/7490-OsAccountViewer-NPE-fix

7490 - Fixed OsAccountDataPanel NPE
This commit is contained in:
Richard Cordovano 2021-04-01 12:00:36 -04:00 committed by GitHub
commit 64c028ca6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -385,12 +385,13 @@ public class OsAccountDataPanel extends JPanel {
Map<Host, DataSource> instanceMap = new HashMap<>();
SleuthkitCase skCase = Case.getCurrentCase().getSleuthkitCase();
OsAccountManager osAccountManager = skCase.getOsAccountManager();
OsAccountRealm realm = skCase.getOsAccountRealmManager().getRealmById(account.getRealmId());
if(account == null) {
account = osAccountManager.getOsAccountByObjectId(accountId);
}
OsAccountRealm realm = skCase.getOsAccountRealmManager().getRealmById(account.getRealmId());
List<Host> hosts = osAccountManager.getHosts(account);
List<OsAccountAttribute> attributeList = account.getOsAccountAttributes();