Sorry, I think I hadn't yet merged that from artifact trunk. Let me do that for consistency as it was a little different and includes a test.

On 09/07/2008, at 2:54 AM, [EMAIL PROTECTED] wrote:

Author: jdcasey
Date: Tue Jul  8 09:54:18 2008
New Revision: 674876

URL: http://svn.apache.org/viewvc?rev=674876&view=rev
Log:
Taking another shot at cleaning up the NPE related to wagon beta-3 and the digest that goes null on a transfer error...this time, remove the checksum observers before verifying the checksum(s).

Modified:
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/ main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java

Modified: maven/components/branches/maven-2.0.x/maven-artifact- manager/src/main/java/org/apache/maven/artifact/manager/ DefaultWagonManager.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java?rev=674876&r1=674875&r2=674876&view=diff
= = = = = = = = ====================================================================== --- maven/components/branches/maven-2.0.x/maven-artifact-manager/src/ main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java (original) +++ maven/components/branches/maven-2.0.x/maven-artifact-manager/src/ main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java Tue Jul 8 09:54:18 2008
@@ -468,6 +468,16 @@

                    if ( downloaded )
                    {
+                        if ( sha1ChecksumObserver != null )
+                        {
+ wagon.removeTransferListener( sha1ChecksumObserver );
+                        }
+
+                        if ( md5ChecksumObserver != null )
+                        {
+ wagon.removeTransferListener( md5ChecksumObserver );
+                        }
+
// keep the checksum files from showing up on the download monitor...
                        if ( downloadMonitor != null )
                        {



--
Brett Porter
[EMAIL PROTECTED]
http://blogs.exist.com/bporter/


---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to