From 31ddd33d763c4fc1f2c8a68602fc8fc6c347288c Mon Sep 17 00:00:00 2001
From: anttil <anttil>
Date: Wed, 28 Aug 2013 11:48:08 +0000
Subject: [PATCH] BIS-487 / SP-813: Print CRC32 checksums in hex format
SVN: 29687
---
.../archiveverifier/verifier/ZipFileHeaderVerifier.java | 8 ++++++--
.../verifier/ZipFileIntegrityVerifier.java | 6 ++++--
.../verifier/ZipFileIntegrityVerifierTest.java | 1 -
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/verifier/ZipFileHeaderVerifier.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/verifier/ZipFileHeaderVerifier.java
index 89be8c69fea..5e80b08c3d5 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/verifier/ZipFileHeaderVerifier.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/verifier/ZipFileHeaderVerifier.java
@@ -16,6 +16,8 @@
package ch.systemsx.cisd.openbis.dss.archiveverifier.verifier;
+import static ch.systemsx.cisd.common.io.IOUtilities.crc32ToString;
+
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.List;
@@ -92,11 +94,13 @@ public class ZipFileHeaderVerifier extends AbstractZipFileVerifier
} else if (externalCrc != entry.getCrc())
{
- errors.add(entryName + ": CRC32 in archive file: " + entry.getCrc() + ", CRC32 in " + repositoryName + ": " + externalCrc);
+ errors.add(entryName + ": CRC32 in archive file: " + crc32ToString((int) entry.getCrc()) + ", CRC32 in " + repositoryName + ": "
+ + crc32ToString((int) externalCrc.longValue()));
}
} else if (externalCrc != null)
{
- errors.add(entryName + ": CRC32 found in " + repositoryName + " even it should be disabled. Value was " + externalCrc);
+ errors.add(entryName + ": CRC32 found in " + repositoryName + " even it should be disabled. Value was "
+ + crc32ToString((int) externalCrc.longValue()));
}
}
return errors;
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/verifier/ZipFileIntegrityVerifier.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/verifier/ZipFileIntegrityVerifier.java
index 0a6e5f46acd..66f94f1644d 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/verifier/ZipFileIntegrityVerifier.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/verifier/ZipFileIntegrityVerifier.java
@@ -16,6 +16,8 @@
package ch.systemsx.cisd.openbis.dss.archiveverifier.verifier;
+import static ch.systemsx.cisd.common.io.IOUtilities.crc32ToString;
+
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
@@ -59,8 +61,8 @@ public class ZipFileIntegrityVerifier extends AbstractZipFileVerifier
long crc = calculateCRC32(input);
if (crc != entry.getCrc())
{
- return Arrays.asList(entry.getName() + ": CRC failure (got " + Long.toHexString(crc) + ", should be "
- + Long.toHexString(entry.getCrc()) + ")");
+ return Arrays.asList(entry.getName() + ": CRC failure (got " + crc32ToString((int) crc) + ", should be "
+ + crc32ToString((int) entry.getCrc()) + ")");
}
} catch (ZipException ex)
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/archiveverifier/verifier/ZipFileIntegrityVerifierTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/archiveverifier/verifier/ZipFileIntegrityVerifierTest.java
index 5ab5b6b839c..8b648190ad3 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/archiveverifier/verifier/ZipFileIntegrityVerifierTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/archiveverifier/verifier/ZipFileIntegrityVerifierTest.java
@@ -54,7 +54,6 @@ public class ZipFileIntegrityVerifierTest
public void verificationOfValidZipFileSucceeds() throws Exception
{
List<String> errors = verifier.verify(VALID_ZIP_FILE);
- System.out.println(errors);
assertThat(errors.isEmpty(), is(true));
}
--
GitLab