summaryrefslogtreecommitdiff
path: root/lib/singleton.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/singleton.rb')
-rw-r--r--lib/singleton.rb8
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/singleton.rb b/lib/singleton.rb
index 8167a01aa8..235ba898fd 100644
--- a/lib/singleton.rb
+++ b/lib/singleton.rb
@@ -14,9 +14,15 @@ module Singleton
def Singleton.append_features(klass)
klass.private_class_method(:new)
klass.instance_eval %{
+ @__instance__ = nil
def instance
+ Thread.critical = true
unless @__instance__
- @__instance__ = new
+ begin
+ @__instance__ = new
+ ensure
+ Thread.critical = false
+ end
end
return @__instance__
end