You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by do...@apache.org on 2006/04/04 00:09:52 UTC

svn commit: r391157 - /spamassassin/trunk/lib/Mail/SpamAssassin/Timeout.pm

Author: dos
Date: Mon Apr  3 15:09:51 2006
New Revision: 391157

URL: http://svn.apache.org/viewcvs?rev=391157&view=rev
Log:
bug 4699: avoid cases where timeouts can occur without a die() call

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/Timeout.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Timeout.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/Timeout.pm?rev=391157&r1=391156&r2=391157&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Timeout.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Timeout.pm Mon Apr  3 15:09:51 2006
@@ -178,9 +178,7 @@
         die $@;             # propagate any "real" errors
       }
     }
-  }
-
-  if ($timedout) {
+  } elsif ($timedout) {
     warn "timeout with empty \$@";  # this is worth complaining about
     $self->{timed_out} = 1;
   }