Author: trygvis Date: Thu Sep 1 14:53:54 2005 New Revision: 265787 URL: http://svn.apache.org/viewcvs?rev=265787&view=rev Log: Fixing MNG-797: "fix checksum parsing"
Modified: maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java Modified: maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java?rev=265787&r1=265786&r2=265787&view=diff ============================================================================== --- maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java (original) +++ maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java Thu Sep 1 14:53:54 2005 @@ -483,6 +483,26 @@ wagon.get( remotePath + checksumFileExtension, checksumFile ); String expectedChecksum = FileUtils.fileRead( checksumFile ); + + // remove whitespaces at the end + expectedChecksum = expectedChecksum.trim(); + + // check for 'MD5 (name) = CHECKSUM' + if ( expectedChecksum.startsWith( "MD5" ) ) + { + int lastSpacePos = expectedChecksum.lastIndexOf( ' ' ); + expectedChecksum = expectedChecksum.substring( lastSpacePos + 1 ); + } + else + { + // remove everything after the first space (if available) + int spacePos = expectedChecksum.indexOf( ' ' ); + + if ( spacePos != -1 ) + { + expectedChecksum = expectedChecksum.substring( 0, spacePos ); + } + } if ( !expectedChecksum.equals( actualChecksum ) ) { throw new ChecksumFailedException( "Checksum failed on download: local = '" + actualChecksum + --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]