From c44118b8a0dad1cef18f3294e15f15509e66e9e8 Mon Sep 17 00:00:00 2001 From: ocean Date: Sun, 5 Feb 2006 05:28:11 +0000 Subject: [PATCH] * lib/pstore.rb: should return default value if name is not found. [ruby-core:7304] * lib/pstore.rb: should raise PStore::Error if not in transaction. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@9887 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 10 +++++++--- lib/pstore.rb | 5 +++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index ab3cca9827..e934a0dc5e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Sun Feb 5 14:22:15 2006 Hirokazu Yamamoto + + * lib/pstore.rb: should return default value if name is not found. + [ruby-core:7304] + + * lib/pstore.rb: should raise PStore::Error if not in transaction. + Sat Feb 4 22:51:43 2006 Tanaka Akira * eval.c: apply the FreeBSD getcontext/setcontext workaround @@ -13,9 +20,6 @@ Sat Feb 4 15:56:37 2006 Hirokazu Yamamoto * numeric.c (fix_to_s): (2**32).to_s(2) fails with exception where sizeof(int) == 4 < sizeof(long). [ruby-core:7300] - I think the function name of rb_int2big is quite misleading. - This should be "rb_long2big". - Fri Feb 3 15:06:50 2006 Hirokazu Yamamoto * ext/syck/syck.c (syck_move_tokens): should reset p->cursor or etc diff --git a/lib/pstore.rb b/lib/pstore.rb index a691ce611e..46123bf0a7 100644 --- a/lib/pstore.rb +++ b/lib/pstore.rb @@ -135,14 +135,15 @@ class PStore # raise PStore::Error if called at any other time. # def fetch(name, default=PStore::Error) + in_transaction unless @table.key? name if default==PStore::Error raise PStore::Error, format("undefined root name `%s'", name) else - default + return default end end - self[name] + @table[name] end # # Stores an individual Ruby object or a hierarchy of Ruby objects in the data