View | Details | Raw Unified | Return to bug 7587
Collapse All | Expand All

(-)lib/Mail/SpamAssassin/Plugin/TxRep.pm (-4 / +6 lines)
Lines 1444-1450 Link Here
1444
    my $meanrep;
1444
    my $meanrep;
1445
    my $timer = $self->{main}->time_method('check_txrep_'.lc($key));
1445
    my $timer = $self->{main}->time_method('check_txrep_'.lc($key));
1446
1446
1447
    if (defined $storage) {
1447
    if (!defined $storage) {
1448
        $self->{checker} = $self->{$storage};
1448
        $self->{checker} = $self->{$storage};
1449
    }
1449
    }
1450
    my $found  = $self->get_sender($id, $ip, $signedby);
1450
    my $found  = $self->get_sender($id, $ip, $signedby);
Lines 1510-1516 Link Here
1510
        $self->{checker}->remove_entry($self->{entry}); #forgetting the message ID
1510
        $self->{checker}->remove_entry($self->{entry}); #forgetting the message ID
1511
    }
1511
    }
1512
  }
1512
  }
1513
  if (defined $storage) {
1513
  if (!defined $storage) {
1514
    $self->{checker} = $self->{default_storage};
1514
    $self->{checker} = $self->{default_storage};
1515
  }
1515
  }
1516
1516
Lines 1633-1638 Link Here
1633
  # disabled per bug 7191
1633
  # disabled per bug 7191
1634
  #return 1 unless (!defined $self->{default_storage});
1634
  #return 1 unless (!defined $self->{default_storage});
1635
1635
1636
  return 1 if defined ($self->{checker});
1637
1636
  my $factory;
1638
  my $factory;
1637
  if ($self->{main}->{pers_addr_list_factory}) {
1639
  if ($self->{main}->{pers_addr_list_factory}) {
1638
    $factory = $self->{main}->{pers_addr_list_factory};
1640
    $factory = $self->{main}->{pers_addr_list_factory};
Lines 1721-1728 Link Here
1721
    $self->{global_storage} = undef;
1723
    $self->{global_storage} = undef;
1722
  } elsif (defined $self->{default_storage}) {
1724
  } elsif (defined $self->{default_storage}) {
1723
    $self->{default_storage}->finish();
1725
    $self->{default_storage}->finish();
1724
    $self->{default_storage} = $self->{checker} = undef;
1725
  }
1726
  }
1727
 $self->{default_storage} = $self->{checker} = undef;
1726
 $self->{factory} = undef;
1728
 $self->{factory} = undef;
1727
}
1729
}
1728
1730
Lines 1812-1818 Link Here
1812
###########################################################################
1814
###########################################################################
1813
  my ($self) = @_;
1815
  my ($self) = @_;
1814
1816
1815
  $self->{txKeepStoreTied} = 1;
1817
  $self->{txKeepStoreTied} = undef;
1816
  return $self;
1818
  return $self;
1817
}
1819
}
1818
1820

Return to bug 7587