Cleanup

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

@@ -42,11 +42,4 @@ public interface AddDataSourceCallbacks {
 	 * @throws AddDataSourceCallbacksException 
 	 */
 	void onFilesAdded(List<Long> fileObjectIds) throws AddDataSourceCallbacksException;
-	
-	/**
-	 * Call when the data source processing is complete.
-	 * 
-	 * @throws AddDataSourceCallbacksException 
-	 */
-	void onCompleted() throws AddDataSourceCallbacksException;
 }

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

@@ -403,6 +403,7 @@ private long addBatchedFilesToDb() {
                     logger.log(Level.SEVERE, "Error adding file to the database - parent object ID: " + computedParentObjId
                             + ", file system object ID: " + fileInfo.fsObjId + ", name: " + fileInfo.name, ex);
                     revertTransaction();
+					batchedFiles.clear();
                     return -1;
                 }
             }
@@ -413,12 +414,14 @@ private long addBatchedFilesToDb() {
 					addDataSourceCallbacks.onFilesAdded(newObjIds);
 				} catch (AddDataSourceCallbacksException ex) {
 					logger.log(Level.SEVERE, "Error adding files to ingest stream");
+					batchedFiles.clear();
 					return -1;
 				}
 			}
         } catch (TskCoreException ex) {
             logger.log(Level.SEVERE, "Error adding batched files to database", ex);
             revertTransaction();
+			batchedFiles.clear();
             return -1;
         }
         batchedFiles.clear();

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

@@ -550,6 +550,7 @@ public void run(String deviceId, String[] imageFilePaths, int sectorSize) throws
 			 *                       (e.g., a UUID).
 			 * @param imageFilePaths Full path(s) to the image file(s).
 			 * @param sectorSize     The sector size (use '0' for autodetect).
+			 * @param addDataSourceCallbacks  The callbacks to use to send data to ingest (may do nothing).
 			 *
 			 * @throws TskCoreException if a critical error occurs within the
 			 *                          SleuthKit.