From 04772757a8f017a032fa8290b6516245536a9adc Mon Sep 17 00:00:00 2001
From: Ann Priestman <apriestman@basistech.com>
Date: Wed, 20 Mar 2019 09:08:18 -0400
Subject: [PATCH] Don't display an error pop up if image size is zero

---
 .../autopsy/modules/dataSourceIntegrity/Bundle.properties   | 1 -
 .../modules/dataSourceIntegrity/Bundle.properties-MERGED    | 1 -
 .../modules/dataSourceIntegrity/Bundle_ja.properties        | 1 -
 .../DataSourceIntegrityIngestModule.java                    | 6 +-----
 4 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/modules/dataSourceIntegrity/Bundle.properties b/Core/src/org/sleuthkit/autopsy/modules/dataSourceIntegrity/Bundle.properties
index 0abc26b359..033aa497ed 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/dataSourceIntegrity/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/modules/dataSourceIntegrity/Bundle.properties
@@ -5,7 +5,6 @@ DataSourceIntegrityIngestModule.process.errProcImg=Error processing {0}
 DataSourceIntegrityIngestModule.process.skipNonEwf=Skipping non-disk image data source {0}
 DataSourceIntegrityIngestModule.process.noStoredHash=Image {0} does not have stored hash.
 DataSourceIntegrityIngestModule.process.startingImg=Starting {0}
-DataSourceIntegrityIngestModule.process.errGetSizeOfImg=Error getting size of {0}. Image will not be processed.
 DataSourceIntegrityIngestModule.process.errReadImgAtChunk=Error reading {0} at chunk {1}
 DataSourceIntegrityIngestModule.shutDown.verified=\ verified 
 DataSourceIntegrityIngestModule.shutDown.notVerified=\ not verified 
diff --git a/Core/src/org/sleuthkit/autopsy/modules/dataSourceIntegrity/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/modules/dataSourceIntegrity/Bundle.properties-MERGED
index 6e469cd5d1..b006deb22d 100755
--- a/Core/src/org/sleuthkit/autopsy/modules/dataSourceIntegrity/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/modules/dataSourceIntegrity/Bundle.properties-MERGED
@@ -37,7 +37,6 @@ DataSourceIntegrityIngestModule.process.errProcImg=Error processing {0}
 DataSourceIntegrityIngestModule.process.skipNonEwf=Skipping non-disk image data source {0}
 DataSourceIntegrityIngestModule.process.noStoredHash=Image {0} does not have stored hash.
 DataSourceIntegrityIngestModule.process.startingImg=Starting {0}
-DataSourceIntegrityIngestModule.process.errGetSizeOfImg=Error getting size of {0}. Image will not be processed.
 DataSourceIntegrityIngestModule.process.errReadImgAtChunk=Error reading {0} at chunk {1}
 DataSourceIntegrityIngestModule.shutDown.verified=\ verified 
 DataSourceIntegrityIngestModule.shutDown.notVerified=\ not verified 
diff --git a/Core/src/org/sleuthkit/autopsy/modules/dataSourceIntegrity/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/modules/dataSourceIntegrity/Bundle_ja.properties
index e0028e2703..cbd02b8693 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/dataSourceIntegrity/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/modules/dataSourceIntegrity/Bundle_ja.properties
@@ -5,7 +5,6 @@ DataSourceIntegrityModuleFactory.moduleDesc.text=E01\u30d5\u30a1\u30a4\u30eb\u30
 DataSourceIntegrityIngestModule.process.skipNonEwf=E01\u30a4\u30e1\u30fc\u30b8\u3067\u306f\u306a\u3044{0}\u3092\u30b9\u30ad\u30c3\u30d7\u3057\u3066\u3044\u307e\u3059
 DataSourceIntegrityIngestModule.process.noStoredHash=\u30a4\u30e1\u30fc\u30b8{0}\u306f\u4fdd\u5b58\u3055\u308c\u3066\u3044\u308b\u30cf\u30c3\u30b7\u30e5\u304c\u3042\u308a\u307e\u305b\u3093\u3002
 DataSourceIntegrityIngestModule.process.startingImg={0}\u3092\u958b\u59cb\u4e2d
-DataSourceIntegrityIngestModule.process.errGetSizeOfImg={0}\u306e\u30b5\u30a4\u30ba\u306e\u53d6\u5f97\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u30a4\u30e1\u30fc\u30b8\u306f\u51e6\u7406\u3055\u308c\u307e\u305b\u3093\u3002
 DataSourceIntegrityIngestModule.process.errReadImgAtChunk={0}\u306e\u30c1\u30e3\u30f3\u30af{1}\u306e\u8aad\u307f\u53d6\u308a\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f
 DataSourceIntegrityIngestModule.shutDown.calcHashLi=<li>\u8a08\u7b97\u3055\u308c\u305f\u30cf\u30c3\u30b7\u30e5\u5024\uff1a{0}</li>
 DataSourceIntegrityIngestModule.shutDown.notVerified=\u8a8d\u8a3c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f
diff --git a/Core/src/org/sleuthkit/autopsy/modules/dataSourceIntegrity/DataSourceIntegrityIngestModule.java b/Core/src/org/sleuthkit/autopsy/modules/dataSourceIntegrity/DataSourceIntegrityIngestModule.java
index fa8d70794a..34a7ec2702 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/dataSourceIntegrity/DataSourceIntegrityIngestModule.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/dataSourceIntegrity/DataSourceIntegrityIngestModule.java
@@ -127,14 +127,10 @@ public class DataSourceIntegrityIngestModule implements DataSourceIngestModule {
         }
         Image img = (Image) dataSource;
 
-        // Make sure the image size we have is not zero
+        // Get the image size. Log a warning if it is zero.
         long size = img.getSize();
         if (size == 0) {
             logger.log(Level.WARNING, "Size of image {0} was 0 when queried.", imgName); //NON-NLS
-            services.postMessage(IngestMessage.createMessage(MessageType.ERROR, DataSourceIntegrityModuleFactory.getModuleName(),
-                    NbBundle.getMessage(this.getClass(),
-                            "DataSourceIntegrityIngestModule.process.errGetSizeOfImg",
-                            imgName)));
         }
         
         // Determine which mode we're in.