[Jifty-commit] r1495 - in jifty/trunk: lib/Jifty

[jifty-commit at lists.jifty.org]

Author: alexmv
Date: Fri Jul  7 00:31:57 2006
New Revision: 1495

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/lib/Jifty/Request.pm

Log:
 r15073 at zoq-fot-pik:  chmrr | 2006-07-07 00:31:44 -0400
  * Better error handling -- provide a default path, and wrap YAML and
 JSON calls in eval's, in case they explode.


Modified: jifty/trunk/lib/Jifty/Request.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Request.pm	(original)
+++ jifty/trunk/lib/Jifty/Request.pm	Fri Jul  7 00:31:57 2006
@@ -123,9 +123,9 @@
     # Check it for something appropriate
     if ($data) {
         if ($ct eq "text/x-json") {
-            return $self->from_data_structure(Jifty::JSON::jsonToObj($data));
+            return $self->from_data_structure(eval{Jifty::JSON::jsonToObj($data)});
         } elsif ($ct eq "text/x-yaml") {
-            return $self->from_data_structure(Jifty::YAML::Load($data));
+            return $self->from_data_structure(eval{Jifty::YAML::Load($data)});
         }
     }
 
@@ -147,7 +147,7 @@
     my $self = shift;
     my $data = shift;
 
-    $self->path($data->{path});
+    $self->path($data->{path} || "/");
     $self->just_validating($data->{validating}) if $data->{validating};
 
     if (ref $data->{continuation} eq "HASH") {