svn commit: r1801892 - in /vcl/trunk/managementnode/lib/VCL: inuse.pm reserved.pm

[arkurth]

Author: arkurth
Date: Thu Jul 13 21:19:25 2017
New Revision: 1801892

URL: http://svn.apache.org/viewvc?rev=1801892&view=rev
Log:
VCL-993
Updated calls to $self->data->get_user_imtype_name() to set the return value to 
'none' if it's set to NULL in the database to prevent vcld.log uninitialized 
concatenation warnings.

Modified:
    vcl/trunk/managementnode/lib/VCL/inuse.pm
    vcl/trunk/managementnode/lib/VCL/reserved.pm

Modified: vcl/trunk/managementnode/lib/VCL/inuse.pm
URL: 
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/inuse.pm?rev=1801892&r1=1801891&r2=1801892&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/inuse.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/inuse.pm Thu Jul 13 21:19:25 2017
@@ -371,7 +371,7 @@ sub notify_user_future_endtime {
        my $user_login_id                = $self->data->get_user_login_id();
        my $user_email                   = $self->data->get_user_email();
        my $user_emailnotices            = $self->data->get_user_emailnotices();
-       my $user_imtype_name             = $self->data->get_user_imtype_name();
+       my $user_imtype_name             = $self->data->get_user_imtype_name() 
|| 'none';;
        my $user_im_id                   = $self->data->get_user_im_id();
        
        my $user_message_key = 'future_endtime';
@@ -437,7 +437,7 @@ sub notify_user_endtime_imminent {
        my $user_login_id                = $self->data->get_user_login_id();
        my $user_email                   = $self->data->get_user_email();
        my $user_emailnotices            = $self->data->get_user_emailnotices();
-       my $user_imtype_name             = $self->data->get_user_imtype_name();
+       my $user_imtype_name             = $self->data->get_user_imtype_name() 
|| 'none';;
        my $user_im_id                   = $self->data->get_user_im_id();
        my $is_parent_reservation        = $self->data->is_parent_reservation();
        my $request_forimaging           = 
$self->data->get_request_forimaging();
@@ -498,7 +498,7 @@ sub notify_user_timeout_inactivity {
        my $user_affiliation_helpaddress = 
$self->data->get_user_affiliation_helpaddress();
        my $user_email                   = $self->data->get_user_email();
        my $user_emailnotices            = $self->data->get_user_emailnotices();
-       my $user_imtype_name             = $self->data->get_user_imtype_name();
+       my $user_imtype_name             = $self->data->get_user_imtype_name() 
|| 'none';;
        my $user_im_id                   = $self->data->get_user_im_id();
        my $is_parent_reservation        = $self->data->is_parent_reservation();
        
@@ -538,7 +538,7 @@ sub notify_user_endtime_reached {
        my $user_affiliation_helpaddress = 
$self->data->get_user_affiliation_helpaddress();
        my $user_email                   = $self->data->get_user_email();
        my $user_emailnotices            = $self->data->get_user_emailnotices();
-       my $user_imtype_name             = $self->data->get_user_imtype_name();
+       my $user_imtype_name             = $self->data->get_user_imtype_name() 
|| 'none';;
        my $user_im_id                   = $self->data->get_user_im_id();
        my $is_parent_reservation        = $self->data->is_parent_reservation();
        

Modified: vcl/trunk/managementnode/lib/VCL/reserved.pm
URL: 
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/reserved.pm?rev=1801892&r1=1801891&r2=1801892&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/reserved.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/reserved.pm Thu Jul 13 21:19:25 2017
@@ -419,7 +419,7 @@ sub notify_user_ready {
        my $request_state_name = $self->data->get_request_id();
        my $user_email = $self->data->get_user_email();
        my $user_emailnotices = $self->data->get_user_emailnotices();
-       my $user_imtype_name = $self->data->get_user_imtype_name();
+       my $user_imtype_name = $self->data->get_user_imtype_name() || 'none';;
        my $user_im_id = $self->data->get_user_im_id();
        my $affiliation_helpaddress = 
$self->data->get_user_affiliation_helpaddress();
        my $is_parent_reservation = $self->data->is_parent_reservation();
@@ -468,7 +468,7 @@ sub notify_user_timeout_no_initial_conne
        
        my $user_email                 = $self->data->get_user_email();
        my $user_emailnotices          = $self->data->get_user_emailnotices();
-       my $user_im_name               = $self->data->get_user_imtype_name();
+       my $user_im_name               = $self->data->get_user_imtype_name() || 
'none';;
        my $user_im_id                 = $self->data->get_user_im_id();
        my $affiliation_helpaddress    = 
$self->data->get_user_affiliation_helpaddress();
        my $is_parent_reservation      = $self->data->is_parent_reservation();
@@ -506,7 +506,7 @@ sub notify_user_timeout_no_acknowledgeme
        
        my $user_email                 = $self->data->get_user_email();
        my $user_emailnotices          = $self->data->get_user_emailnotices();
-       my $user_im_name               = $self->data->get_user_imtype_name();
+       my $user_im_name               = $self->data->get_user_imtype_name() || 
'none';;
        my $user_im_id                 = $self->data->get_user_im_id();
        my $affiliation_helpaddress    = 
$self->data->get_user_affiliation_helpaddress();
        my $is_parent_reservation      = $self->data->is_parent_reservation();