Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
f0528a54
R
rails
项目概览
张重言
/
rails
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rails
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f0528a54
编写于
3月 04, 2016
作者:
M
Matthew Draper
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Prevent nested ExecutionWrapper calls even when using run! directly
上级
2c53e279
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
16 addition
and
9 deletion
+16
-9
activesupport/lib/active_support/execution_wrapper.rb
activesupport/lib/active_support/execution_wrapper.rb
+15
-6
activesupport/lib/active_support/reloader.rb
activesupport/lib/active_support/reloader.rb
+1
-3
未找到文件。
activesupport/lib/active_support/execution_wrapper.rb
浏览文件 @
f0528a54
...
...
@@ -4,6 +4,10 @@ module ActiveSupport
class
ExecutionWrapper
include
ActiveSupport
::
Callbacks
Null
=
Object
.
new
# :nodoc:
def
Null
.
complete!
# :nodoc:
end
define_callbacks
:run
define_callbacks
:complete
...
...
@@ -22,7 +26,11 @@ def self.to_complete(*args, &block)
#
# Where possible, prefer +wrap+.
def
self
.
run!
new
.
tap
(
&
:run!
)
if
active?
Null
else
new
.
tap
(
&
:run!
)
end
end
# Perform the work in the supplied block as an execution.
...
...
@@ -43,17 +51,17 @@ class << self # :nodoc:
def
self
.
inherited
(
other
)
# :nodoc:
super
other
.
active
=
Concurrent
::
Hash
.
new
(
0
)
other
.
active
=
Concurrent
::
Hash
.
new
end
self
.
active
=
Concurrent
::
Hash
.
new
(
0
)
self
.
active
=
Concurrent
::
Hash
.
new
def
self
.
active?
# :nodoc:
@active
[
Thread
.
current
]
>
0
@active
[
Thread
.
current
]
end
def
run!
# :nodoc:
self
.
class
.
active
[
Thread
.
current
]
+=
1
self
.
class
.
active
[
Thread
.
current
]
=
true
run_callbacks
(
:run
)
end
...
...
@@ -63,7 +71,8 @@ def run! # :nodoc:
# Where possible, prefer +wrap+.
def
complete!
run_callbacks
(
:complete
)
self
.
class
.
active
.
delete
Thread
.
current
if
(
self
.
class
.
active
[
Thread
.
current
]
-=
1
)
==
0
ensure
self
.
class
.
active
.
delete
Thread
.
current
end
end
end
activesupport/lib/active_support/reloader.rb
浏览文件 @
f0528a54
...
...
@@ -22,8 +22,6 @@ module ActiveSupport
# unloaded.
#
class
Reloader
<
ExecutionWrapper
Null
=
Class
.
new
(
ExecutionWrapper
)
# :nodoc:
define_callbacks
:prepare
define_callbacks
:class_unload
...
...
@@ -54,7 +52,7 @@ def self.run! # :nodoc:
if
check!
super
else
Null
.
run!
Null
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录