diff --git a/bindings/java/src/org/sleuthkit/datamodel/HostManager.java b/bindings/java/src/org/sleuthkit/datamodel/HostManager.java index d8255b2e7823a93e715bb3264b3f2794ac95f6ab..fb8d2eda00053413b525f4a5df7dd11c087f6b37 100755 --- a/bindings/java/src/org/sleuthkit/datamodel/HostManager.java +++ b/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(); } diff --git a/bindings/java/src/org/sleuthkit/datamodel/SlackFile.java b/bindings/java/src/org/sleuthkit/datamodel/SlackFile.java index e6bf7c4e0d5c2ff98fc2efdaa90c9d08e5907630..f53f63aa79748cf033fa0c667342ccf031e6504f 100644 --- a/bindings/java/src/org/sleuthkit/datamodel/SlackFile.java +++ b/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; diff --git a/bindings/java/src/org/sleuthkit/datamodel/SleuthkitCase.java b/bindings/java/src/org/sleuthkit/datamodel/SleuthkitCase.java index c04094367e8b6e2164ad3896bffb941361514893..5cbde51eccbbba7ca93bb8d4c8546e867ddfea01 100644 --- a/bindings/java/src/org/sleuthkit/datamodel/SleuthkitCase.java +++ b/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);