Merge pull request #2856 from sleuthkit/ct-3.8.0

Sync Changes from CT 3.8.0 to develop

bindings/java/src/org/sleuthkit/datamodel/HostManager.java

@@ -295,7 +295,7 @@ public List<DataSource> getDataSourcesForHost(Host host) throws TskCoreException
 
 			return dataSources;
 		} catch (SQLException | TskDataException ex) {
-			throw new TskCoreException(String.format("Error getting data sources for host " + host.getName()), ex);
+			throw new TskCoreException(String.format("Error getting data sources for host %s", host.getName()), ex);
 		} finally {
 			db.releaseSingleUserCaseReadLock();
 		}

bindings/java/src/org/sleuthkit/datamodel/SlackFile.java

@@ -117,7 +117,7 @@ public class SlackFile extends FsContent {
 	 */
 	@Override
 	@SuppressWarnings("deprecation")
-	protected int readInt(byte[] buf, long offset, long len) throws TskCoreException {
+	protected synchronized int readInt(byte[] buf, long offset, long len) throws TskCoreException {
 		if (offset == 0 && size == 0) {
 			//special case for 0-size file
 			return 0;

bindings/java/src/org/sleuthkit/datamodel/SleuthkitCase.java

@@ -10090,16 +10090,16 @@ public void setImagePaths(long obj_id, List<String> paths) throws TskCoreExcepti
 	 *                          within tsk core and the update fails
 	 */
 	@Beta
-	public void setImagePaths(long obj_id, List<String> paths, CaseDbTransaction trans) throws TskCoreException {	
+	public void setImagePaths(long objId, List<String> paths, CaseDbTransaction trans) throws TskCoreException {	
 		try {
 			PreparedStatement statement = trans.getConnection().getPreparedStatement(PREPARED_STATEMENT.DELETE_IMAGE_NAME);
 			statement.clearParameters();
-			statement.setLong(1, obj_id);
+			statement.setLong(1, objId);
 			trans.getConnection().executeUpdate(statement);
 			for (int i = 0; i < paths.size(); i++) {
 				statement = trans.getConnection().getPreparedStatement(PREPARED_STATEMENT.INSERT_IMAGE_NAME);
 				statement.clearParameters();
-				statement.setLong(1, obj_id);
+				statement.setLong(1, objId);
 				statement.setString(2, paths.get(i));
 				statement.setLong(3, i);
 				trans.getConnection().executeUpdate(statement);