From 9f4ae7f14b7854fb6a296cf11b0c74df1e94bced Mon Sep 17 00:00:00 2001
From: Srdjan <srdjan@catalyst.net.nz>
Date: Tue, 12 Jun 2012 14:15:25 +1200
Subject: [PATCH] [SIGNED-OFF] Bug 5911: Followup - make perlcdritic happy, shut up warnings

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
---
 C4/HoldsQueue.pm |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/C4/HoldsQueue.pm b/C4/HoldsQueue.pm
index f6be999..28656eb 100755
--- a/C4/HoldsQueue.pm
+++ b/C4/HoldsQueue.pm
@@ -564,11 +564,18 @@ sub debug {
 #   warn @_;
 }
 
+sub _trim {
+    return $_[0] unless $_[0];
+    $_[0] =~ s/^\s+//;
+    $_[0] =~ s/\s+$//;
+    $_[0];
+}
+
 sub load_branches_to_pull_from {
     my $static_branch_list = C4::Context->preference("StaticHoldsQueueWeight")
       or return;
 
-    my @branches_to_use = map { s/^\s+//; s/\s+$//; $_; } split /,/, $static_branch_list;
+    my @branches_to_use = map _trim($_), split /,/, $static_branch_list;
 
     @branches_to_use = shuffle(@branches_to_use) if  C4::Context->preference("RandomizeHoldsQueueWeight");
 
@@ -590,6 +597,7 @@ sub least_cost_branch {
         next if $cell->{disable_transfer};
 
         my $cost = $cell->{cost};
+        next unless defined $cost; # XXX should this be reported?
 
         unless (defined $least_cost) {
             $least_cost = $cost;
-- 
1.7.2.5