Changeset 805

Timestamp:

02/15/10 15:40:38 (14 years ago)

Author:

nanardon

Message:

• don't use eval so real error get not trap and kill the program in case of serious issue

File:

• LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Objects.pm (modified) (3 diffs)

LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Objects.pm

@@ -195 +195 @@
     my ($self, $cfield) = @_;
     my $return;
-    eval {
-        $self->base->check_acl($self, $cfield, 'r') or die "Permission denied";
-        $return = $self->_get_c_field($cfield);
+    $self->base->check_acl($self, $cfield, 'r') or do {
+        $self->base->log(LA_ERR, "Permission denied to get %s/%s",
+            $self->id, $cfield
+        );
+        return;
     };
-    $return
+    return $self->_get_c_field($cfield);
 }
 
@@ -223 +225 @@
     my ($self, $cfield) = @_;
     my $return;
-    eval {
-        my $field = $self->base->get_field_name($self->type, $cfield, 'r') or
-            die "Unknow attribute $cfield";
-        $return = $self->get_field($field);
+    my $field = $self->base->get_field_name($self->type, $cfield, 'r') or do {
+        $self->base->log(LA_WARN, "Unknow attribute $cfield");
+        return;
     };
-    $return
+    $return = $self->get_field($field);
 }
 
@@ -275 +276 @@
 sub set_c_fields {
     my ($self, %cdata) = @_;
-    eval {
-        foreach my $cfield (keys %cdata) {
-            $self->base->check_acl($self, $cfield, 'w') or 
-                die "permission denied\n";
-        }
-
-        foreach my $cfield (keys %cdata) {
-            $self->check_allowed_values($cfield, $cdata{$cfield}) or
-                die "incorrect attribute\n";
-        }
-    };
-    if($@) {
-        $self->base->log(LA_ERR, "Cannot modified %s/%s: %s",
-            $self->type, $self->id, $@
-        );
-        return;
+    foreach my $cfield (keys %cdata) {
+        $self->base->check_acl($self, $cfield, 'w') or do { 
+            $self->base->log(LA_ERR, "Cannot modified %s/%s: %s",
+                $self->type, $self->id, "permission denied");
+            return;
+        };
+    }
+
+    foreach my $cfield (keys %cdata) {
+        $self->check_allowed_values($cfield, $cdata{$cfield}) or do {
+            $self->base->log(LA_ERR, "Cannot modified %s/%s: %s",
+                $self->type, $self->id, "non authorized value");
+            return;
+        };
     }
     $self->_set_c_fields(%cdata);