From b09ad2b8476d3e42d35ef8bf17cbfa94d45150e1 Mon Sep 17 00:00:00 2001 From: tenderlove Date: Fri, 18 Jun 2010 18:38:19 +0000 Subject: * ext/psych/lib/psych/visitors/to_ruby.rb (resolve_klass): fix the exception message when attempting to load an unknown class. Thanks nobu! [ruby-dev:41399] * test/psych/test_psych.rb: test for the exception message git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28361 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/psych/lib/psych/visitors/to_ruby.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ext') diff --git a/ext/psych/lib/psych/visitors/to_ruby.rb b/ext/psych/lib/psych/visitors/to_ruby.rb index e28ac7bf87..ffff636d8e 100644 --- a/ext/psych/lib/psych/visitors/to_ruby.rb +++ b/ext/psych/lib/psych/visitors/to_ruby.rb @@ -246,13 +246,13 @@ module Psych begin path2class(name) - rescue ArgumentError => ex - name = "Struct::#{name}" + rescue ArgumentError, NameError => ex unless retried - retried = true + name = "Struct::#{name}" + retried = ex retry end - raise ex + raise retried end end end -- cgit v1.2.3