Port Serialize classes except for View.

hdp · Dec 19, 2009 · 7f36b63 · 7f36b63
1 parent 878b2b5
commit 7f36b63
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 30 deletions.
diff --git a/lib/Catalyst/Action/Serialize/Data/Serializer.pm b/lib/Catalyst/Action/Serialize/Data/Serializer.pm
@@ -23,16 +23,10 @@ sub execute {
     };
     if ($@) {
         $c->log->info("Could not load $serializer, refusing to serialize: $@");
-        return 0;
+        return;
     }
     my $dso = Data::Serializer->new( serializer => $serializer );
-    my $data;
-    eval {
-       $data = $dso->raw_serialize($c->stash->{$stash_key});
-    };
-    if ($@) {
-        return $@;
-    } 
+    my $data = $dso->raw_serialize($c->stash->{$stash_key});
     $c->response->output( $data );
     return 1;
 }

diff --git a/lib/Catalyst/Action/Serialize/JSON.pm b/lib/Catalyst/Action/Serialize/JSON.pm
@@ -15,13 +15,7 @@ sub execute {
                 $controller->{'serialize'}->{'stash_key'} :
                 $controller->{'stash_key'} 
         ) || 'rest';
-    my $output;
-    eval {
-        $output = $self->serialize( $c->stash->{$stash_key} );
-    };
-    if ($@) {
-        return $@;
-    }
+    my $output = $self->serialize( $c->stash->{$stash_key} );
     $c->response->output( $output );
     return 1;
 }

diff --git a/lib/Catalyst/Action/Serialize/XML/Simple.pm b/lib/Catalyst/Action/Serialize/XML/Simple.pm
@@ -15,7 +15,7 @@ sub execute {
     if ($@) {
         $c->log->debug("Could not load XML::Serializer, refusing to serialize: $@")
             if $c->debug;
-        return 0;
+        return;
     }
     my $xs = XML::Simple->new(ForceArray => 0,);
 
@@ -24,13 +24,7 @@ sub execute {
                 $controller->{'serialize'}->{'stash_key'} :
                 $controller->{'stash_key'} 
         ) || 'rest';
-    my $output;
-    eval {
-        $output = $xs->XMLout({ data => $c->stash->{$stash_key} });
-    };
-    if ($@) {
-        return $@;
-    }
+    my $output = $xs->XMLout({ data => $c->stash->{$stash_key} });
     $c->response->output( $output );
     return 1;
 }

diff --git a/lib/Catalyst/Action/Serialize/YAML.pm b/lib/Catalyst/Action/Serialize/YAML.pm
@@ -15,13 +15,7 @@ sub execute {
                 $controller->{'serialize'}->{'stash_key'} :
                 $controller->{'stash_key'} 
         ) || 'rest';
-    my $output;
-    eval {
-        $output = $self->serialize($c->stash->{$stash_key});
-    };
-    if ($@) {
-        return $@;
-    }
+    my $output = $self->serialize($c->stash->{$stash_key});
     $c->response->output( $output );
     return 1;
 }