Merge pull request #2917 from jayaramcs/ct-3.10.0

jayaramcs · web-flow · commit 8f9fa8a9b2c6 · 2024-04-30T11:46:22.000-04:00
OS Account where clause SQL error.
diff --git a/bindings/java/src/org/sleuthkit/datamodel/OsAccountManager.java b/bindings/java/src/org/sleuthkit/datamodel/OsAccountManager.java
@@ -794,8 +794,8 @@ OsAccountInstance newOsAccountInstance(long osAccountId, long dataSourceObjId, O
 		// It's possible that we weren't able to load the account instance because it
 		// is already in the database but the instance cache was cleared during an account merge.
 		// Try loading it here and re-adding to the cache.
-		String whereClause = "tsk_os_account_instances.os_account_obj_id = " + osAccountId
-				+ "AND tsk_os_account_instances.data_source_obj_id = " + dataSourceObjId;
+		String whereClause = " tsk_os_account_instances.os_account_obj_id = " + osAccountId
+						   + " AND tsk_os_account_instances.data_source_obj_id = " + dataSourceObjId;
 		List<OsAccountInstance> instances = getOsAccountInstances(whereClause);
 		if (instances.isEmpty()) {
 			throw new TskCoreException(String.format("Could not get autogen key after row insert or reload instance for OS account instance. OS account object id = %d, data source object id = %d", osAccountId, dataSourceObjId));
@@ -1525,7 +1525,7 @@ List<OsAccountAttribute> getOsAccountAttributes(OsAccount account) throws TskCor
 	 * @throws TskCoreException
 	 */
 	public List<OsAccountInstance> getOsAccountInstances(OsAccount account) throws TskCoreException {
-		String whereClause = "tsk_os_account_instances.os_account_obj_id = " + account.getId();
+		String whereClause = " tsk_os_account_instances.os_account_obj_id = " + account.getId();
 		return getOsAccountInstances(whereClause);
 	}
 
