From 4f4ea9db28aa51fcb578e1fcaac06bea07b3def7 Mon Sep 17 00:00:00 2001 From: ocean Date: Sun, 5 Feb 2006 05:28:11 +0000 Subject: * 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/trunk@9887 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/pstore.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib/pstore.rb') 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 -- cgit v1.2.3