diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/AbstractSqlEamDb.java b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/AbstractSqlEamDb.java index 5dc8bff71f..37e0bf59f2 100644 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/AbstractSqlEamDb.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/AbstractSqlEamDb.java @@ -1060,16 +1060,34 @@ abstract class AbstractSqlEamDb implements EamDb { @Override public List getArtifactInstancesByTypeValue(CorrelationAttributeInstance.Type aType, String value) throws EamDbException, CorrelationAttributeNormalizationException { + if (value == null) { + throw new CorrelationAttributeNormalizationException("Cannot get artifact instances for null value"); + } return getArtifactInstancesByTypeValues(aType, Arrays.asList(value)); } @Override public List getArtifactInstancesByTypeValues(CorrelationAttributeInstance.Type aType, List values) throws EamDbException, CorrelationAttributeNormalizationException { + if (aType == null) { + throw new CorrelationAttributeNormalizationException("Cannot get artifact instances for null type"); + } + if (values == null || values.isEmpty()) { + throw new CorrelationAttributeNormalizationException("Cannot get artifact instances without specified values"); + } return getArtifactInstances(prepareGetInstancesSql(aType, values), aType); } @Override public List getArtifactInstancesByTypeValuesAndCases(CorrelationAttributeInstance.Type aType, List values, List caseIds) throws EamDbException, CorrelationAttributeNormalizationException { + if (aType == null) { + throw new CorrelationAttributeNormalizationException("Cannot get artifact instances for null type"); + } + if (values == null || values.isEmpty()) { + throw new CorrelationAttributeNormalizationException("Cannot get artifact instances without specified values"); + } + if (caseIds == null || caseIds.isEmpty()) { + throw new CorrelationAttributeNormalizationException("Cannot get artifact instances without specified cases"); + } String tableName = EamDbUtil.correlationTypeToInstanceTableName(aType); String sql = " and "