X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FResponse.pm;h=595decb4cbdb06836ed53c90f32041aa4fd040d0;hp=faa34ae49b0a2c61c90ca3929dd945ecfd64d158;hb=2bf074abee817f84daec2a06822f9dcdb881843f;hpb=536bee890cf24e0e4bcda7562e7b70cc03ca0620

diff --git a/lib/Catalyst/Response.pm b/lib/Catalyst/Response.pm
index faa34ae..595decb 100644
--- a/lib/Catalyst/Response.pm
+++ b/lib/Catalyst/Response.pm
@@ -6,7 +6,14 @@ use HTTP::Headers;
 with 'MooseX::Emulate::Class::Accessor::Fast';
 
 has cookies   => (is => 'rw', default => sub { {} });
-has body      => (is => 'rw', default => '', lazy => 1, predicate => 'has_body');
+has body      => (is => 'rw', default => '', lazy => 1, predicate => 'has_body',
+    clearer => '_clear_body'
+);
+after 'body' => sub { # If someone assigned undef, clear the body so we get ''
+    if (scalar(@_) == 2 && !defined($_[1])) {
+         $_[0]->_clear_body;
+    }
+};
 has location  => (is => 'rw');
 has status    => (is => 'rw', default => 200);
 has finalized_headers => (is => 'rw', default => 0);
@@ -103,7 +110,7 @@ The keys of the hash reference on the right correspond to the L<CGI::Cookie>
 parameters of the same name, except they are used without a leading dash.
 Possible parameters are:
 
-=over 
+=over
 
 =item value
 
@@ -173,7 +180,7 @@ Sets or returns the HTTP status.
     $c->response->status(404);
 
 $res->code is an alias for this, to match HTTP::Response->code.
-    
+
 =head2 $res->write( $data )
 
 Writes $data to the output stream.
@@ -199,7 +206,7 @@ sub print {
         defined $self->write($,) or return;
         defined $self->write($_) or return;
     }
-    
+
     return 1;
 }
 
@@ -209,7 +216,7 @@ Catalyst Contributors, see Catalyst.pm
 
 =head1 COPYRIGHT
 
-This library is free software. You can redistribute it and/or modify 
+This library is free software. You can redistribute it and/or modify
 it under the same terms as Perl itself.
 
 =cut