[OpenSRF-GIT] OpenSRF branch rel_2_2 updated. osrf_rel_2_2_0-5-g425821b

Evergreen Git git at git.evergreen-ils.org
Mon Oct 21 00:19:33 EDT 2013


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OpenSRF".

The branch, rel_2_2 has been updated
       via  425821b7a8e4dde99beeb325a119e3dae154e1b3 (commit)
      from  d081052e872468d228d55c8fc4eb6cffa527da3b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 425821b7a8e4dde99beeb325a119e3dae154e1b3
Author: Jason Etheridge <jason at esilibrary.com>
Date:   Thu Aug 1 14:15:14 2013 -0400

    silence some uninitialized warnings
    
    Signed-off-by: Jason Etheridge <jason at esilibrary.com>
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

diff --git a/src/perl/lib/OpenSRF/DomainObject/oilsMethod.pm b/src/perl/lib/OpenSRF/DomainObject/oilsMethod.pm
index a5a674f..4259ab3 100644
--- a/src/perl/lib/OpenSRF/DomainObject/oilsMethod.pm
+++ b/src/perl/lib/OpenSRF/DomainObject/oilsMethod.pm
@@ -91,7 +91,11 @@ sub params {
 	my $self = shift;
 	my @args = @_;
 	$self->{params} = \@args if (@args);
-	return @{ $self->{params} };
+	if ($self->{params}) {
+		return @{ $self->{params} };
+	} else {
+		return ();
+	}
 }
 
 1;
diff --git a/src/perl/lib/OpenSRF/Utils.pm b/src/perl/lib/OpenSRF/Utils.pm
index dc88d6a..61596d0 100644
--- a/src/perl/lib/OpenSRF/Utils.pm
+++ b/src/perl/lib/OpenSRF/Utils.pm
@@ -265,7 +265,7 @@ sub interval_to_seconds {
                 $amount += 60 * $count if ($type =~ /^m(?!o)/oi);
                 $amount += 60 * 60 * $count if ($type =~ /^h/);
                 $amount += 60 * 60 * 24 * $count if ($type =~ /^d/oi);
-                $amount += 60 * 60 * 24 * 7 * $count if ($2 =~ /^w/oi);
+                $amount += 60 * 60 * 24 * 7 * $count if (defined $2 && $2 =~ /^w/oi);
                 $amount += ((60 * 60 * 24 * 365)/12) * $count if ($type =~ /^mo/io);
                 $amount += 60 * 60 * 24 * 365 * $count if ($type =~ /^y/oi);
         }

-----------------------------------------------------------------------

Summary of changes:
 src/perl/lib/OpenSRF/DomainObject/oilsMethod.pm |    6 +++++-
 src/perl/lib/OpenSRF/Utils.pm                   |    2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
OpenSRF


More information about the opensrf-commits mailing list