Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
3f594cc4
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
3
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_jdk
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
3f594cc4
编写于
12月 07, 2015
作者:
A
asaha
浏览文件
操作
浏览文件
下载
差异文件
Merge
上级
df78ec48
fbd91851
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
90 addition
and
27 deletion
+90
-27
.hgtags
.hgtags
+1
-0
src/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java
...s/sun/reflect/annotation/AnnotationInvocationHandler.java
+45
-7
src/share/lib/security/blacklisted.certs
src/share/lib/security/blacklisted.certs
+20
-19
src/share/lib/security/blacklisted.certs.pem
src/share/lib/security/blacklisted.certs.pem
+23
-0
test/java/nio/channels/ServerSocketChannel/AdaptServerSocket.java
...a/nio/channels/ServerSocketChannel/AdaptServerSocket.java
+1
-1
未找到文件。
.hgtags
浏览文件 @
3f594cc4
...
@@ -508,6 +508,7 @@ a81edad7e1e16c2b3cf2e60a8a98e232ebcaf3b1 jdk8u71-b08
...
@@ -508,6 +508,7 @@ a81edad7e1e16c2b3cf2e60a8a98e232ebcaf3b1 jdk8u71-b08
eac13ca04cc5c9adb4f14a76856376db0187f7dc jdk8u71-b09
eac13ca04cc5c9adb4f14a76856376db0187f7dc jdk8u71-b09
e494e93d48f943229223d881a2928064a69cdf23 jdk8u71-b10
e494e93d48f943229223d881a2928064a69cdf23 jdk8u71-b10
32226f73879f21f7a7bb024f4197c089b53a93c4 jdk8u71-b11
32226f73879f21f7a7bb024f4197c089b53a93c4 jdk8u71-b11
8181f8b6ef0d861f57547c89e52f258cb5583b77 jdk8u71-b12
be5faa9c77042f202106c18f4e8ea211137b4a3b jdk8u72-b00
be5faa9c77042f202106c18f4e8ea211137b4a3b jdk8u72-b00
5ad1e9e8e8417f80c91d7e0f1f44cdf89b34ead3 jdk8u72-b01
5ad1e9e8e8417f80c91d7e0f1f44cdf89b34ead3 jdk8u72-b01
ab0c1040414d038ccbcfcc8ceb1ccf2f44ead8e4 jdk8u72-b02
ab0c1040414d038ccbcfcc8ceb1ccf2f44ead8e4 jdk8u72-b02
...
...
src/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java
浏览文件 @
3f594cc4
...
@@ -25,6 +25,7 @@
...
@@ -25,6 +25,7 @@
package
sun.reflect.annotation
;
package
sun.reflect.annotation
;
import
java.io.ObjectInputStream
;
import
java.lang.annotation.*
;
import
java.lang.annotation.*
;
import
java.lang.reflect.*
;
import
java.lang.reflect.*
;
import
java.io.Serializable
;
import
java.io.Serializable
;
...
@@ -425,35 +426,72 @@ class AnnotationInvocationHandler implements InvocationHandler, Serializable {
...
@@ -425,35 +426,72 @@ class AnnotationInvocationHandler implements InvocationHandler, Serializable {
private
void
readObject
(
java
.
io
.
ObjectInputStream
s
)
private
void
readObject
(
java
.
io
.
ObjectInputStream
s
)
throws
java
.
io
.
IOException
,
ClassNotFoundException
{
throws
java
.
io
.
IOException
,
ClassNotFoundException
{
s
.
defaultReadObject
();
ObjectInputStream
.
GetField
fields
=
s
.
readFields
();
@SuppressWarnings
(
"unchecked"
)
Class
<?
extends
Annotation
>
t
=
(
Class
<?
extends
Annotation
>)
fields
.
get
(
"type"
,
null
);
@SuppressWarnings
(
"unchecked"
)
Map
<
String
,
Object
>
streamVals
=
(
Map
<
String
,
Object
>)
fields
.
get
(
"memberValues"
,
null
);
// Check to make sure that types have not evolved incompatibly
// Check to make sure that types have not evolved incompatibly
AnnotationType
annotationType
=
null
;
AnnotationType
annotationType
=
null
;
try
{
try
{
annotationType
=
AnnotationType
.
getInstance
(
t
ype
);
annotationType
=
AnnotationType
.
getInstance
(
t
);
}
catch
(
IllegalArgumentException
e
)
{
}
catch
(
IllegalArgumentException
e
)
{
// Class is no longer an annotation type; time to punch out
// Class is no longer an annotation type; time to punch out
throw
new
java
.
io
.
InvalidObjectException
(
"Non-annotation type in annotation serial stream"
);
throw
new
java
.
io
.
InvalidObjectException
(
"Non-annotation type in annotation serial stream"
);
}
}
Map
<
String
,
Class
<?>>
memberTypes
=
annotationType
.
memberTypes
();
Map
<
String
,
Class
<?>>
memberTypes
=
annotationType
.
memberTypes
();
// consistent with runtime Map type
Map
<
String
,
Object
>
mv
=
new
LinkedHashMap
<>();
// If there are annotation members without values, that
// If there are annotation members without values, that
// situation is handled by the invoke method.
// situation is handled by the invoke method.
for
(
Map
.
Entry
<
String
,
Object
>
memberValue
:
memberValue
s
.
entrySet
())
{
for
(
Map
.
Entry
<
String
,
Object
>
memberValue
:
streamVal
s
.
entrySet
())
{
String
name
=
memberValue
.
getKey
();
String
name
=
memberValue
.
getKey
();
Object
value
=
null
;
Class
<?>
memberType
=
memberTypes
.
get
(
name
);
Class
<?>
memberType
=
memberTypes
.
get
(
name
);
if
(
memberType
!=
null
)
{
// i.e. member still exists
if
(
memberType
!=
null
)
{
// i.e. member still exists
Object
value
=
memberValue
.
getValue
();
value
=
memberValue
.
getValue
();
if
(!(
memberType
.
isInstance
(
value
)
||
if
(!(
memberType
.
isInstance
(
value
)
||
value
instanceof
ExceptionProxy
))
{
value
instanceof
ExceptionProxy
))
{
memberValue
.
setValue
(
value
=
new
AnnotationTypeMismatchExceptionProxy
(
new
AnnotationTypeMismatchExceptionProxy
(
value
.
getClass
()
+
"["
+
value
+
"]"
).
setMember
(
value
.
getClass
()
+
"["
+
value
+
"]"
).
setMember
(
annotationType
.
members
().
get
(
name
))
)
;
annotationType
.
members
().
get
(
name
));
}
}
}
}
mv
.
put
(
name
,
value
);
}
UnsafeAccessor
.
setType
(
this
,
t
);
UnsafeAccessor
.
setMemberValues
(
this
,
mv
);
}
private
static
class
UnsafeAccessor
{
private
static
final
sun
.
misc
.
Unsafe
unsafe
;
private
static
final
long
typeOffset
;
private
static
final
long
memberValuesOffset
;
static
{
try
{
unsafe
=
sun
.
misc
.
Unsafe
.
getUnsafe
();
typeOffset
=
unsafe
.
objectFieldOffset
(
AnnotationInvocationHandler
.
class
.
getDeclaredField
(
"type"
));
memberValuesOffset
=
unsafe
.
objectFieldOffset
(
AnnotationInvocationHandler
.
class
.
getDeclaredField
(
"memberValues"
));
}
catch
(
Exception
ex
)
{
throw
new
ExceptionInInitializerError
(
ex
);
}
}
static
void
setType
(
AnnotationInvocationHandler
o
,
Class
<?
extends
Annotation
>
type
)
{
unsafe
.
putObject
(
o
,
typeOffset
,
type
);
}
static
void
setMemberValues
(
AnnotationInvocationHandler
o
,
Map
<
String
,
Object
>
memberValues
)
{
unsafe
.
putObject
(
o
,
memberValuesOffset
,
memberValues
);
}
}
}
}
}
}
src/share/lib/security/blacklisted.certs
浏览文件 @
3f594cc4
Algorithm=SHA-256
Algorithm=SHA-256
76A45A496031E4DD2D7ED23E8F6FF97DBDEA980BAAC8B0BA94D7EDB551348645
76A45A496031E4DD2D7ED23E8F6FF97DBDEA980BAAC8B0BA94D7EDB551348645
4CBBF8256BC9888A8007B2F386940A2E394378B0D903CBB3863C5A6394B889CE
4CBBF8256BC9888A8007B2F386940A2E394378B0D903CBB3863C5A6394B889CE
D24566BF315F4E597D6E381C87119FB4198F5E9E2607F5F4AB362EF7E2E7672F
D24566BF315F4E597D6E381C87119FB4198F5E9E2607F5F4AB362EF7E2E7672F
14E6D2764A4B06701C6CBC376A253775F79C782FBCB6C0EE6F99DE4BA1024ADD
14E6D2764A4B06701C6CBC376A253775F79C782FBCB6C0EE6F99DE4BA1024ADD
D3A936E1A7775A45217C8296A1F22AC5631DCDEC45594099E78EEEBBEDCBA967
D3A936E1A7775A45217C8296A1F22AC5631DCDEC45594099E78EEEBBEDCBA967
5E83124D68D24E8E177E306DF643D5EA99C5A94D6FC34B072F7544A1CABB7C7B
5E83124D68D24E8E177E306DF643D5EA99C5A94D6FC34B072F7544A1CABB7C7B
9ED8F9B0E8E42A1656B8E1DD18F42BA42DC06FE52686173BA2FC70E756F207DC
9ED8F9B0E8E42A1656B8E1DD18F42BA42DC06FE52686173BA2FC70E756F207DC
FDEDB5BDFCB67411513A61AEE5CB5B5D7C52AF06028EFC996CC1B05B1D6CEA2B
FDEDB5BDFCB67411513A61AEE5CB5B5D7C52AF06028EFC996CC1B05B1D6CEA2B
A686FEE577C88AB664D0787ECDFFF035F4806F3DE418DC9E4D516324FFF02083
A686FEE577C88AB664D0787ECDFFF035F4806F3DE418DC9E4D516324FFF02083
4FEE0163686ECBD65DB968E7494F55D84B25486D438E9DE558D629D28CD4D176
4FEE0163686ECBD65DB968E7494F55D84B25486D438E9DE558D629D28CD4D176
8A1BD21661C60015065212CC98B1ABB50DFD14C872A208E66BAE890F25C448AF
8A1BD21661C60015065212CC98B1ABB50DFD14C872A208E66BAE890F25C448AF
B8686723E415534BC0DBD16326F9486F85B0B0799BF6639334E61DAAE67F36CD
B8686723E415534BC0DBD16326F9486F85B0B0799BF6639334E61DAAE67F36CD
3946901F46B0071E90D78279E82FABABCA177231A704BE72C5B0E8918566EA66
3946901F46B0071E90D78279E82FABABCA177231A704BE72C5B0E8918566EA66
31C8FD37DB9B56E708B03D1F01848B068C6DA66F36FB5D82C008C6040FA3E133
31C8FD37DB9B56E708B03D1F01848B068C6DA66F36FB5D82C008C6040FA3E133
450F1B421BB05C8609854884559C323319619E8B06B001EA2DCBB74A23AA3BE2
450F1B421BB05C8609854884559C323319619E8B06B001EA2DCBB74A23AA3BE2
FC02FD48DB92D4DCE6F11679D38354CF750CFC7F584A520EB90BDE80E241F2BD
FC02FD48DB92D4DCE6F11679D38354CF750CFC7F584A520EB90BDE80E241F2BD
DF21016B00FC54F9FE3BC8B039911BB216E9162FAD2FD14D990AB96E951B49BE
DF21016B00FC54F9FE3BC8B039911BB216E9162FAD2FD14D990AB96E951B49BE
F5B6F88F75D391A4B1EB336F9E201239FB6B1377DB8CFA7B84736216E5AFFFD7
F5B6F88F75D391A4B1EB336F9E201239FB6B1377DB8CFA7B84736216E5AFFFD7
EC30C9C3065A06BB07DC5B1C6B497F370C1CA65C0F30C08E042BA6BCECC78F2C
src/share/lib/security/blacklisted.certs.pem
浏览文件 @
3f594cc4
...
@@ -719,3 +719,26 @@ v9qpeC45ZA/jelxV11HKbQnVF194gDb7D2H9OsAsRUy8HVKbXEcc/8dKvwOqb+BC
...
@@ -719,3 +719,26 @@ v9qpeC45ZA/jelxV11HKbQnVF194gDb7D2H9OsAsRUy8HVKbXEcc/8dKvwOqb+BC
DBabJH1vJ9Gd+KwxMCmBZ6pQPl28JDimhJhI2LNqU349uADQVV0HJosddN/ARyyI
DBabJH1vJ9Gd+KwxMCmBZ6pQPl28JDimhJhI2LNqU349uADQVV0HJosddN/ARyyI
LSIQO7BnNVKVG9Iujf33bvPNeg0qNz5qw+rKKq97Pqeum+L5oKU=
LSIQO7BnNVKVG9Iujf33bvPNeg0qNz5qw+rKKq97Pqeum+L5oKU=
-----END CERTIFICATE-----
-----END CERTIFICATE-----
// Subject: CN=eDellRoot
// Issuer: CN=eDellRoot
// Serial Number:
// 6b:c5:7b:95:18:93:aa:97:4b:62:4a:c0:88:fc:3b:b6
-----BEGIN CERTIFICATE-----
MIIC8zCCAd+gAwIBAgIQa8V7lRiTqpdLYkrAiPw7tjAJBgUrDgMCHQUAMBQxEjAQ
BgNVBAMTCWVEZWxsUm9vdDAeFw0xNTA0MDcxMDIzMjdaFw0zOTEyMzEyMzU5NTla
MBQxEjAQBgNVBAMTCWVEZWxsUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
AQoCggEBAL3RJg1uzVuEX0Hw4XWGzs6oI9W+o7HZdVdBMMVb4Gzb4uZjCTNjbPx4
b8LNFL1uArUt+5VVMQDsOTY3Lg/Xe/UNukY2b+0llUOzzBYYpbsFcco4n6SsTvDh
Ni5t+kPo7c23ZrYBPmOu82eEJ6cavs/t39u+wFOkXXwvRCiHA/lWyNWNEPh17+bC
EP3q5N+JrV+6Ho3zQPEv5QUJYdmXsMmD2CMQojeQUj68J91P5w5BKjurG0xjivzh
Soie9ym7VRwLFjWScRuw/9XV6CLqTyL5xrqiiDp1uTOuqNj3uxyts9ocbsoJXuxj
5iEYkSM1nvLupEv+lgy9WqzIEFMm1l8CAwEAAaNJMEcwRQYDVR0BBD4wPIAQYA/f
EzPwmaRcZuSaa/VZ1KEWMBQxEjAQBgNVBAMTCWVEZWxsUm9vdIIQa8V7lRiTqpdL
YkrAiPw7tjAJBgUrDgMCHQUAA4IBAQArfdcScsezj8ooJ92UwwnPgg36noOgiUs5
XzPLP4h0JpUYQVKB9hY1WTDwRUfTKGh7oNOowd027a/rVSb/TNeoiJIvMKn4gbvV
CWAiHhO8u2u0RkHCDVsa7e0i4ncpueWsihjn6jBrY8T+7eDYwiFT/F03A8NJ7mK5
lZA8SFd5CTDy3EBUU5UwzXUc5HoIRUxXSPycu3aIBWawg3sCdKiAoikScPAWj0bM
0vmsP/8QSlTOBqO+QFQ6R82BtTvBNU3qbVICV4QObsxib++FAFL56NApPqskg7Vz
LfNIAjKabHUcjbuZkmg6jr4BfYW7+oQDHCsYgADjjKGdKz/8U/fP
-----END CERTIFICATE-----
test/java/nio/channels/ServerSocketChannel/AdaptServerSocket.java
浏览文件 @
3f594cc4
...
@@ -122,7 +122,7 @@ public class AdaptServerSocket {
...
@@ -122,7 +122,7 @@ public class AdaptServerSocket {
public
static
void
main
(
String
[]
args
)
throws
Exception
{
public
static
void
main
(
String
[]
args
)
throws
Exception
{
test
(
0
,
0
,
false
);
test
(
0
,
0
,
false
);
test
(
50
,
500
,
false
);
test
(
50
,
500
0
,
false
);
test
(
500
,
50
,
true
);
test
(
500
,
50
,
true
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录