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 89be8c69fea7f9032f8da55f3d8b5e7ac4d0f58d..5e80b08c3d5679de1381201f57131e02f7d6e9c6 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 0a6e5f46acd2f238ae060f9dcb49a57f235eb996..66f94f1644d70bab54d477e17467c2d690da92d1 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 5ab5b6b839c888f4d1f0d565ac4c4b1d10b375a4..8b648190ad33cfb0fa49906fd80ae7980fbed3c4 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)); }