Author: fapeeler
Date: Fri Jul 22 20:19:12 2011
New Revision: 1149722
URL: http://svn.apache.org/viewvc?rev=1149722&view=rev
Log:
VCL-463
moved serverrequest_ conditional check up in the if,elsif checks.
request_ check was catching it and the variables were not being set correctly
Modified:
incubator/vcl/trunk/managementnode/lib/VCL/utils.pm
Modified: incubator/vcl/trunk/managementnode/lib/VCL/utils.pm
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/utils.pm?rev=1149722&r1=1149721&r2=1149722&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/utils.pm (original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/utils.pm Fri Jul 22 20:19:12 2011
@@ -4484,7 +4484,10 @@ sub get_request_info {
# This variable stores the original (correct) column
name
(my $original_key = $key) =~ s/^.+_//;
- if ($key =~ /request_/) {
+ if ($key =~ /serverrequest_/) {
+
$request_info{reservation}{$reservation_id}{serverrequest}{$original_key} =
$value;
+ }
+ elsif ($key =~ /request_/) {
# Set the top-level key if not already set
$request_info{$original_key} = $value if
(!$request_info{$original_key});
}
@@ -4497,9 +4500,6 @@ sub get_request_info {
elsif ($key =~ /reservation_/) {
$request_info{reservation}{$reservation_id}{$original_key} = $value;
}
- elsif ($key =~ /serverrequest_/) {
-
$request_info{reservation}{$reservation_id}{serverrequest}{$original_key} =
$value;
- }
} # Close foreach key in reservation row
# Retrieve the image, imagerevision, and computer info and add
to the hash
