Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
阿啄debugIT
transmittable-thread-local
提交
d7720ed4
T
transmittable-thread-local
项目概览
阿啄debugIT
/
transmittable-thread-local
与 Fork 源项目一致
从无法访问的项目Fork
通知
8
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
transmittable-thread-local
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
d7720ed4
编写于
6月 11, 2020
作者:
oldratlee
🔥
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
! fix bug: WeakHashMap in Snapshot led to captured values GCed before replay unexpectedly
上级
ce9999a5
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
17 addition
and
16 deletion
+17
-16
src/main/java/com/alibaba/ttl/TransmittableThreadLocal.java
src/main/java/com/alibaba/ttl/TransmittableThreadLocal.java
+17
-16
未找到文件。
src/main/java/com/alibaba/ttl/TransmittableThreadLocal.java
浏览文件 @
d7720ed4
...
...
@@ -3,6 +3,7 @@ package com.alibaba.ttl;
import
edu.umd.cs.findbugs.annotations.NonNull
;
import
edu.umd.cs.findbugs.annotations.Nullable
;
import
java.util.HashMap
;
import
java.util.Iterator
;
import
java.util.Map
;
import
java.util.WeakHashMap
;
...
...
@@ -371,16 +372,16 @@ public class TransmittableThreadLocal<T> extends InheritableThreadLocal<T> imple
return
new
Snapshot
(
captureTtlValues
(),
captureThreadLocalValues
());
}
private
static
Weak
HashMap
<
TransmittableThreadLocal
<
Object
>,
Object
>
captureTtlValues
()
{
WeakHashMap
<
TransmittableThreadLocal
<
Object
>,
Object
>
ttl2Value
=
new
Weak
HashMap
<
TransmittableThreadLocal
<
Object
>,
Object
>();
private
static
HashMap
<
TransmittableThreadLocal
<
Object
>,
Object
>
captureTtlValues
()
{
HashMap
<
TransmittableThreadLocal
<
Object
>,
Object
>
ttl2Value
=
new
HashMap
<
TransmittableThreadLocal
<
Object
>,
Object
>();
for
(
TransmittableThreadLocal
<
Object
>
threadLocal
:
holder
.
get
().
keySet
())
{
ttl2Value
.
put
(
threadLocal
,
threadLocal
.
copyValue
());
}
return
ttl2Value
;
}
private
static
Weak
HashMap
<
ThreadLocal
<
Object
>,
Object
>
captureThreadLocalValues
()
{
final
WeakHashMap
<
ThreadLocal
<
Object
>,
Object
>
threadLocal2Value
=
new
Weak
HashMap
<
ThreadLocal
<
Object
>,
Object
>();
private
static
HashMap
<
ThreadLocal
<
Object
>,
Object
>
captureThreadLocalValues
()
{
final
HashMap
<
ThreadLocal
<
Object
>,
Object
>
threadLocal2Value
=
new
HashMap
<
ThreadLocal
<
Object
>,
Object
>();
for
(
Map
.
Entry
<
ThreadLocal
<
Object
>,
TtlCopier
<
Object
>>
entry
:
threadLocalHolder
.
entrySet
())
{
final
ThreadLocal
<
Object
>
threadLocal
=
entry
.
getKey
();
final
TtlCopier
<
Object
>
copier
=
entry
.
getValue
();
...
...
@@ -406,8 +407,8 @@ public class TransmittableThreadLocal<T> extends InheritableThreadLocal<T> imple
}
@NonNull
private
static
WeakHashMap
<
TransmittableThreadLocal
<
Object
>,
Object
>
replayTtlValues
(
@NonNull
Weak
HashMap
<
TransmittableThreadLocal
<
Object
>,
Object
>
captured
)
{
WeakHashMap
<
TransmittableThreadLocal
<
Object
>,
Object
>
backup
=
new
Weak
HashMap
<
TransmittableThreadLocal
<
Object
>,
Object
>();
private
static
HashMap
<
TransmittableThreadLocal
<
Object
>,
Object
>
replayTtlValues
(
@NonNull
HashMap
<
TransmittableThreadLocal
<
Object
>,
Object
>
captured
)
{
HashMap
<
TransmittableThreadLocal
<
Object
>,
Object
>
backup
=
new
HashMap
<
TransmittableThreadLocal
<
Object
>,
Object
>();
for
(
final
Iterator
<
TransmittableThreadLocal
<
Object
>>
iterator
=
holder
.
get
().
keySet
().
iterator
();
iterator
.
hasNext
();
)
{
TransmittableThreadLocal
<
Object
>
threadLocal
=
iterator
.
next
();
...
...
@@ -432,8 +433,8 @@ public class TransmittableThreadLocal<T> extends InheritableThreadLocal<T> imple
return
backup
;
}
private
static
WeakHashMap
<
ThreadLocal
<
Object
>,
Object
>
replayThreadLocalValues
(
@NonNull
Weak
HashMap
<
ThreadLocal
<
Object
>,
Object
>
captured
)
{
final
WeakHashMap
<
ThreadLocal
<
Object
>,
Object
>
backup
=
new
Weak
HashMap
<
ThreadLocal
<
Object
>,
Object
>();
private
static
HashMap
<
ThreadLocal
<
Object
>,
Object
>
replayThreadLocalValues
(
@NonNull
HashMap
<
ThreadLocal
<
Object
>,
Object
>
captured
)
{
final
HashMap
<
ThreadLocal
<
Object
>,
Object
>
backup
=
new
HashMap
<
ThreadLocal
<
Object
>,
Object
>();
for
(
Map
.
Entry
<
ThreadLocal
<
Object
>,
Object
>
entry
:
captured
.
entrySet
())
{
final
ThreadLocal
<
Object
>
threadLocal
=
entry
.
getKey
();
...
...
@@ -456,9 +457,9 @@ public class TransmittableThreadLocal<T> extends InheritableThreadLocal<T> imple
*/
@NonNull
public
static
Object
clear
()
{
final
WeakHashMap
<
TransmittableThreadLocal
<
Object
>,
Object
>
ttl2Value
=
new
Weak
HashMap
<
TransmittableThreadLocal
<
Object
>,
Object
>();
final
HashMap
<
TransmittableThreadLocal
<
Object
>,
Object
>
ttl2Value
=
new
HashMap
<
TransmittableThreadLocal
<
Object
>,
Object
>();
final
WeakHashMap
<
ThreadLocal
<
Object
>,
Object
>
threadLocal2Value
=
new
Weak
HashMap
<
ThreadLocal
<
Object
>,
Object
>();
final
HashMap
<
ThreadLocal
<
Object
>,
Object
>
threadLocal2Value
=
new
HashMap
<
ThreadLocal
<
Object
>,
Object
>();
for
(
Map
.
Entry
<
ThreadLocal
<
Object
>,
TtlCopier
<
Object
>>
entry
:
threadLocalHolder
.
entrySet
())
{
final
ThreadLocal
<
Object
>
threadLocal
=
entry
.
getKey
();
threadLocal2Value
.
put
(
threadLocal
,
threadLocalClearMark
);
...
...
@@ -482,7 +483,7 @@ public class TransmittableThreadLocal<T> extends InheritableThreadLocal<T> imple
restoreThreadLocalValues
(
backupSnapshot
.
threadLocal2Value
);
}
private
static
void
restoreTtlValues
(
@NonNull
Weak
HashMap
<
TransmittableThreadLocal
<
Object
>,
Object
>
backup
)
{
private
static
void
restoreTtlValues
(
@NonNull
HashMap
<
TransmittableThreadLocal
<
Object
>,
Object
>
backup
)
{
// call afterExecute callback
doExecuteCallback
(
false
);
...
...
@@ -501,14 +502,14 @@ public class TransmittableThreadLocal<T> extends InheritableThreadLocal<T> imple
setTtlValuesTo
(
backup
);
}
private
static
void
setTtlValuesTo
(
@NonNull
Weak
HashMap
<
TransmittableThreadLocal
<
Object
>,
Object
>
ttlValues
)
{
private
static
void
setTtlValuesTo
(
@NonNull
HashMap
<
TransmittableThreadLocal
<
Object
>,
Object
>
ttlValues
)
{
for
(
Map
.
Entry
<
TransmittableThreadLocal
<
Object
>,
Object
>
entry
:
ttlValues
.
entrySet
())
{
TransmittableThreadLocal
<
Object
>
threadLocal
=
entry
.
getKey
();
threadLocal
.
set
(
entry
.
getValue
());
}
}
private
static
void
restoreThreadLocalValues
(
@NonNull
Weak
HashMap
<
ThreadLocal
<
Object
>,
Object
>
backup
)
{
private
static
void
restoreThreadLocalValues
(
@NonNull
HashMap
<
ThreadLocal
<
Object
>,
Object
>
backup
)
{
for
(
Map
.
Entry
<
ThreadLocal
<
Object
>,
Object
>
entry
:
backup
.
entrySet
())
{
final
ThreadLocal
<
Object
>
threadLocal
=
entry
.
getKey
();
threadLocal
.
set
(
entry
.
getValue
());
...
...
@@ -516,10 +517,10 @@ public class TransmittableThreadLocal<T> extends InheritableThreadLocal<T> imple
}
private
static
class
Snapshot
{
final
Weak
HashMap
<
TransmittableThreadLocal
<
Object
>,
Object
>
ttl2Value
;
final
Weak
HashMap
<
ThreadLocal
<
Object
>,
Object
>
threadLocal2Value
;
final
HashMap
<
TransmittableThreadLocal
<
Object
>,
Object
>
ttl2Value
;
final
HashMap
<
ThreadLocal
<
Object
>,
Object
>
threadLocal2Value
;
private
Snapshot
(
WeakHashMap
<
TransmittableThreadLocal
<
Object
>,
Object
>
ttl2Value
,
Weak
HashMap
<
ThreadLocal
<
Object
>,
Object
>
threadLocal2Value
)
{
private
Snapshot
(
HashMap
<
TransmittableThreadLocal
<
Object
>,
Object
>
ttl2Value
,
HashMap
<
ThreadLocal
<
Object
>,
Object
>
threadLocal2Value
)
{
this
.
ttl2Value
=
ttl2Value
;
this
.
threadLocal2Value
=
threadLocal2Value
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录