Author: glandais Date: 2008-04-14 08:54:51 +0000 (Mon, 14 Apr 2008) New Revision: 1471 Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java Log: Bug md5 Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-04-14 08:54:25 UTC (rev 1470) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-04-14 08:54:51 UTC (rev 1471) @@ -302,9 +302,9 @@ } else { if (entryName.startsWith(FILE_DATA_PREFIX)) { String fileName = entryName.replace(FILE_DATA_PREFIX + FOLDER_SEPARATOR, ""); + String zipMD5 = Attachment.getHashFromUniqueId(fileName); fileName = Attachment.getFileNameFromUniqueId(fileName); String idFile = streamInfo.getUuid(); - String zipMD5 = Attachment.getHashFromUniqueId(fileName); if (!streamInfo.getHash().equals(zipMD5)) { throw new SimExplorerBusinessException(_("simexplorer.service.invalidhash")); } @@ -790,7 +790,7 @@ if (getStorageEngine().canCreateSubVersion(token, metaData.getUuid())) { // trying to save a version with same hash but in superior version // so we will copy versionToUpgrade to metaData.getVersion() - Version versionToUpgrade = Version.valueOf(previousVersion.toString()); + Version versionToUpgrade = previousVersion.getVersion(); // set previous as not being the latest one update(token, previousVersion.getUuid(), previousVersion.getVersion(), null, true);