use eval idiom consistently

mojolicious · Nov 13, 2013 · f8b4ce6 · f8b4ce6
1 parent 9325424
commit f8b4ce6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/Mojo/Server/Prefork.pm b/lib/Mojo/Server/Prefork.pm
@@ -182,8 +182,8 @@ sub _spawn {
           my $old = Time::HiRes::ualarm $self->lock_timeout * 1000000;
           $lock = flock $handle, LOCK_EX;
           Time::HiRes::ualarm $old;
-        };
-        if ($@) { $lock = $@ eq "alarm\n" ? 0 : die($@) }
+          1;
+        } or $lock = $@ eq "alarm\n" ? 0 : die $@;
       }
 
       # Non blocking

diff --git a/lib/Mojo/Template.pm b/lib/Mojo/Template.pm
@@ -118,8 +118,8 @@ sub interpret {
   };
 
   return undef unless my $compiled = $self->compiled;
-  my $output = eval { $compiled->(@_) };
-  return $output unless $@;
+  my $output;
+  return $output if eval { $output = $compiled->(@_); 1 };
 
   # Exception with template context
   return Mojo::Exception->new($@, [$self->template])->verbose(1);