Commit c371209a authored by Maiken's avatar Maiken

Merge branch 'dev-fix3887' into 'master'

Fix for BUGZ-3887 - MaxWallTime and MaxCPUTime not propagated to infosys

See merge request nordugrid/arc!911
parents b4375196 54045fee
......@@ -21,10 +21,11 @@ sub mds_date {
# can have as many parameters as one wants.
sub prioritizedvalues {
my @values = @_;
my $numelements = scalar @values;
while (@values) {
my $current = shift @values;
return $current if (((defined $current) and ($current ne '')) or ((scalar @values) == 1));
return $current if (((defined $current) and ($current ne '')) or ( $numelements == 1));
}
# just in case all the above fails, return empty string
......
......@@ -658,10 +658,11 @@ sub addprefix {
# can have as many parameters as one wants.
sub prioritizedvalues {
my @values = @_;
my $numelements = scalar @values;
while (@values) {
my $current = shift @values;
return $current if (((defined $current) and ($current ne '')) or ((scalar @values) == 1));
return $current if (((defined $current) and ($current ne '')) or ( $numelements == 1));
}
# just in case all the above fails, log and return empty string
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment