MT#21193 fix internal server errors 500 from usage of strict

code dies now, when regex is applied to undef or subroutine exists
via last

Change-Id: I618b0a6351bce2c151b8066f7d41319213eb2ef8
changes/36/7036/1
Gerhard Jungwirth 9 years ago
parent b6ac9c0732
commit 01c24b501d

@ -55,8 +55,8 @@ sub hal_from_item {
$resource{id} = int($item->id);
$resource{carrier_id} = delete $resource{lnp_provider_id};
$resource{start} =~ s/T\d{2}:\d{2}:\d{2}(\+.+)?$//;
$resource{end} =~ s/T\d{2}:\d{2}:\d{2}(\+.+)?$//;
$resource{start} =~ s/T\d{2}:\d{2}:\d{2}(\+.+)?$// if $resource{start};
$resource{end} =~ s/T\d{2}:\d{2}:\d{2}(\+.+)?$// if $resource{end};
$hal->resource({%resource});
return $hal;
}
@ -65,8 +65,8 @@ sub resource_from_item {
my ($self, $c, $item) = @_;
my $r = { $item->get_inflated_columns };
$r->{carrier_id} = delete $r->{lnp_provider_id};
$r->{start} =~ s/T\d{2}:\d{2}:\d{2}(\+.+)?$//;
$r->{end} =~ s/T\d{2}:\d{2}:\d{2}(\+.+)?$//;
$r->{start} =~ s/T\d{2}:\d{2}:\d{2}(\+.+)?$// if $r->{start};
$r->{end} =~ s/T\d{2}:\d{2}:\d{2}(\+.+)?$// if $r->{end};
return $r;
}

@ -625,7 +625,7 @@ sub update_item {
$e =~ /Duplicate entry '([^']+)' for key 'number_idx'/;
$c->log->error("failed to update subscriber, number $1 already exists"); # TODO: user, message, trace, ...
$self->error($c, HTTP_UNPROCESSABLE_ENTITY, "Number '$1' already exists.");
last;
return;
}
my $billing_res = {

Loading…
Cancel
Save