Remove Clone from Spectre, too!

This commit is contained in:
Colin Kuskie 2012-11-16 09:34:21 -08:00
parent 2ec38b1407
commit 21f9af32d2
2 changed files with 5 additions and 4 deletions

View file

@ -1,5 +1,6 @@
7.10.28 7.10.28
- fixed: Clearing the caches for groups that don't exist, but have created group objects. - fixed: Clearing the caches for groups that don't exist, but have created group objects.
- fixed #12398: WebGUI still uses Clone (missed Spectre code)
7.10.27 7.10.27
- fixed #12379: userImport documentation error - fixed #12379: userImport documentation error

View file

@ -20,7 +20,7 @@ use HTTP::Cookies;
use POE qw(Component::Client::HTTP); use POE qw(Component::Client::HTTP);
use Tie::IxHash; use Tie::IxHash;
use JSON qw/ encode_json /; use JSON qw/ encode_json /;
use Clone qw(clone); use Storable qw(dclone);
#------------------------------------------------------------------- #-------------------------------------------------------------------
@ -258,7 +258,7 @@ The id of the instance to retrieve.
sub getInstance { sub getInstance {
my ($self, $instanceId) = @_; my ($self, $instanceId) = @_;
return clone($self->{_queue}{$instanceId}); return dclone($self->{_queue}{$instanceId});
} }
@ -273,7 +273,7 @@ Returns the array of instances from the queue.
sub getInstances { sub getInstances {
my ($self) = @_; my ($self) = @_;
my @instances = values %{$self->{_queue}}; my @instances = values %{$self->{_queue}};
return @{clone(\@instances)}; return @{dclone(\@instances)};
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
@ -305,7 +305,7 @@ sub getJsonStatus {
foreach my $instance ($self->getInstances) { foreach my $instance ($self->getInstances) {
my $site = $instance->{sitename}; my $site = $instance->{sitename};
unless (exists $output{$site}) { # must have an entry for each queue in each site unless (exists $output{$site}) { # must have an entry for each queue in each site
$output{$site} = clone \%queues; $output{$site} = dclone \%queues;
} }
my $queue = ucfirst($instance->{status}); my $queue = ucfirst($instance->{status});
push @{$output{$site}{$queue}}, $instance; push @{$output{$site}{$queue}}, $instance;