[Rt-commit] rtir branch, 2.5-greenville, updated. fcd34a9eb4f76cf3776c41812ed8629c49731725

[Kevin Falcone]

The branch, 2.5-greenville has been updated
       via  fcd34a9eb4f76cf3776c41812ed8629c49731725 (commit)
      from  2289d379b0a4636168488281f58a217a44626e45 (commit)

Summary of changes:
 lib/RT/IR.pm |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

- Log -----------------------------------------------------------------
commit fcd34a9eb4f76cf3776c41812ed8629c49731725
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Fri Oct 23 21:11:36 2009 -0400

    Don't die, this cached is called when RT::IR is loaded
    and the database may not be initialized yet.

diff --git a/lib/RT/IR.pm b/lib/RT/IR.pm
index ffe820f..cca42b4 100644
--- a/lib/RT/IR.pm
+++ b/lib/RT/IR.pm
@@ -238,7 +238,11 @@ sub CustomFields {
 
             my $queue = RT::Queue->new( $RT::SystemUser );
             $queue->Load( $qname );
-            die "Couldn't load queue '$qname'" unless $queue->id;
+            unless ($queue->id) {
+                $RT::Logger->error("Couldn't load queue '$qname'");
+                delete $cache{$type};
+                return;
+            }
 
             my $cfs = RT::CustomFields->new( $RT::SystemUser );
             $cfs->LimitToLookupType( 'RT::Queue-RT::Ticket' );

-----------------------------------------------------------------------