1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Moved Singleton.instance to get rid of redefinition

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2019-06-28 14:23:22 +09:00
parent 951f80f2dd
commit 2d1728b9ce
No known key found for this signature in database
GPG Key ID: 4BC7D6DF58D8DF60
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/singleton.rb
View File

@ -120,6 +120,15 @@ module Singleton
instance instance
end end
def instance # :nodoc:
return @singleton__instance__ if @singleton__instance__
@singleton__mutex__.synchronize {
return @singleton__instance__ if @singleton__instance__
@singleton__instance__ = new()
}
@singleton__instance__
end
private private
def inherited(sub_klass) def inherited(sub_klass)
@ -134,14 +143,6 @@ module Singleton
@singleton__instance__ = nil @singleton__instance__ = nil
@singleton__mutex__ = Thread::Mutex.new @singleton__mutex__ = Thread::Mutex.new
} }
def klass.instance # :nodoc:
return @singleton__instance__ if @singleton__instance__
@singleton__mutex__.synchronize {
return @singleton__instance__ if @singleton__instance__
@singleton__instance__ = new()
}
@singleton__instance__
end
klass klass
end end