Changeset 17650

Timestamp:

May 12, 2008, 5:55:08 PM (18 years ago)

Author:

jhoblitt

Message:

change Nebulous::Server::stat() to not die when passed a non-existant key

Location:

trunk/Nebulous-Server

Files:

• Changes (modified) (1 diff)
• lib/Nebulous/Server.pm (modified) (3 diffs)
• t/09_server_stat_object.t (modified) (2 diffs)

trunk/Nebulous-Server/Changes

@@ -2 +2 @@
 
 0.10
+    - change Nebulous::Server::stat() to not die when passed a non-existant key
     - change listxattr_object() to return an arrayref
     - change default log level to 'WARN'

trunk/Nebulous-Server/lib/Nebulous/Server.pm

@@ -1 +1 @@
 # Copyright (c) 2004-2008  Joshua Hoblitt
 #
-# $Id: Server.pm,v 1.66 2008-05-10 01:15:13 jhoblitt Exp $
+# $Id: Server.pm,v 1.67 2008-05-13 03:55:08 jhoblitt Exp $
 
 package Nebulous::Server;
@@ -1076 +1076 @@
         {
             type        => SCALAR,
-            callbacks   => {
-                'is valid object key' => sub { $self->_is_valid_object_key($_[0]) },
-            },
         },
     );
@@ -1087 +1084 @@
 
     $log->debug("entered - @_");
+
+    # does this key exist?
+    return unless ($self->_is_valid_object_key($key));
 
     # ignore volume

trunk/Nebulous-Server/t/09_server_stat_object.t

@@ -3 +3 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 09_server_stat_object.t,v 1.13 2008-03-20 21:10:14 jhoblitt Exp $
+# $Id: 09_server_stat_object.t,v 1.14 2008-05-13 03:55:08 jhoblitt Exp $
 
 use strict;
@@ -49 +49 @@
 Test::Nebulous->setup;
 
-eval {
-    $neb->stat_object("foo");
-};
-like($@, qr/is valid object key/, "object does not exist");
+{
+    my $stat = $neb->stat_object("foo");
+    is($stat, undef, "object does not exist");
+}
 
 Test::Nebulous->setup;