svn commit: r1221346 - /spamassassin/trunk/lib/Mail/SpamAssassin/Util/ScopedTimer.pm

[mm...@apache.org]

Author: mmartinec
Date: Tue Dec 20 17:14:00 2011
New Revision: 1221346

URL: http://svn.apache.org/viewvc?rev=1221346&view=rev
Log:
Play safe: prevent a warning during an unclean/forced shutdown:
  Can't call method "timer_end" on an undefined value 
  at .../Mail/SpamAssassin/Util/ScopedTimer.pm line 45
  during global destruction


Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/Util/ScopedTimer.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Util/ScopedTimer.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Util/ScopedTimer.pm?rev=1221346&r1=1221345&r2=1221346&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Util/ScopedTimer.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Util/ScopedTimer.pm Tue Dec 20 17:14:00 2011
@@ -42,7 +42,7 @@ sub DESTROY {
   # best practices: prevent potential calls to eval and to system routines
   # in code of a DESTROY method from clobbering global variables $@ and $! 
   local($@,$!);  # keep outer error handling unaffected by DESTROY
-  $self->{main}->timer_end($self->{timer});
+  $self->{main} && $self->{timer} && $self->{main}->timer_end($self->{timer});
 }
 
 1;