Author: chatellier Date: 2011-03-16 17:00:05 +0000 (Wed, 16 Mar 2011) New Revision: 3163 Log: Update nuiton-utils (MD5) Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2011-03-16 16:59:34 UTC (rev 3162) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2011-03-16 17:00:05 UTC (rev 3163) @@ -27,6 +27,7 @@ import static org.nuiton.i18n.I18n._; +import java.io.BufferedInputStream; import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -44,7 +45,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.FileUtil; -import org.nuiton.util.MD5; +import org.nuiton.util.MD5InputStream; +import org.nuiton.util.MD5OutputStream; +import org.nuiton.util.StringUtil; import org.nuiton.util.ZipUtil; import com.jcraft.jsch.JSch; @@ -764,7 +767,7 @@ } if (!StringUtils.isEmpty(md5sum)) { - String localMd5 = MD5.asHex(MD5.getHash(localFile)); + String localMd5 = StringUtil.asHex(MD5InputStream.hash(new BufferedInputStream(new FileInputStream(localFile)))); if (!localMd5.equals(md5sum)) { if (log.isWarnEnabled()) { log.warn("Warning md5 checksum failed (got " + localMd5 + ", expected : " + md5sum + ")");