Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
62cd14c9
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,发现更多精彩内容 >>
提交
62cd14c9
编写于
8月 30, 2015
作者:
A
asaha
浏览文件
操作
浏览文件
下载
差异文件
Merge
上级
f702a110
ccc4a4a1
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
31 addition
and
8 deletion
+31
-8
.hgtags
.hgtags
+2
-0
src/macosx/native/sun/awt/CFRetainedResource.m
src/macosx/native/sun/awt/CFRetainedResource.m
+12
-5
src/share/classes/java/rmi/server/RemoteObjectInvocationHandler.java
...lasses/java/rmi/server/RemoteObjectInvocationHandler.java
+11
-1
src/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java
...x/management/openmbean/OpenMBeanAttributeInfoSupport.java
+6
-2
未找到文件。
.hgtags
浏览文件 @
62cd14c9
...
...
@@ -456,6 +456,7 @@ c4b37246b92736adf5f40c785aabb67a7d227245 jdk8u60-b23
d433f5fd8910bee1f2c295b65cf03977034fe0ea jdk8u60-b24
c8cfbe57bcd5042d2fef42dcef14d73dd4bdc416 jdk8u60-b25
0d6a8a9b26a37678b420ff540b5a622c3f4fd44c jdk8u60-b26
afbc08ea922bf6e5e14d2eea24a2f94f37627ea7 jdk8u60-b27
286b9a885fcc6245fdf2b20697473ec3b35f2538 jdk8u65-b00
80a796d0db958f49a4b0713818227eda8e5efbb9 jdk8u65-b01
77d48e6d111faec236c8678997ae4311151cfee4 jdk8u65-b02
...
...
@@ -465,6 +466,7 @@ fe1c420a8982e58f6d49c50b729732d93f9682dd jdk8u65-b05
3ee40ba7525d6d5ee201a475b967ca2e5c3c9ab3 jdk8u65-b06
bd2ad7acb217391747dae8263c090483af454313 jdk8u65-b07
d215cd281678e4b89a4155755cd6e03e37b7e9b1 jdk8u65-b08
e9de15763a5a3cef64ef1d4bc40a018d4d572325 jdk8u65-b09
e9f82302d5fdef8a0976640e09363895e9dcde3c jdk8u66-b00
64d7bd4e98150447916f210e3bfd6875a4c2728a jdk8u66-b01
d8210091911b14930192abd3138ee37c281fb632 jdk8u66-b02
...
...
src/macosx/native/sun/awt/CFRetainedResource.m
浏览文件 @
62cd14c9
/*
* Copyright (c) 2011, 201
2
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 201
5
, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
...
...
@@ -40,10 +40,17 @@ JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CFRetainedResource_nativeCFRelease
if (releaseOnAppKitThread) {
// Releasing resources on the main AppKit message loop only
// Releasing resources on the nested loops may cause dangling
// pointers after the nested loop is exited
[NSApp postRunnableEvent:^(){
CFRelease(jlong_to_ptr(ptr));
}];
// pointers after the nested loop is exited
if ([NSApp respondsToSelector:@selector(postRunnableEvent:)]) {
[NSApp postRunnableEvent:^() {
CFRelease(jlong_to_ptr(ptr));
}];
} else {
// could happen if we are embedded inside SWT/FX application,
[JNFRunLoop performOnMainThreadWaiting:NO withBlock:^() {
CFRelease(jlong_to_ptr(ptr));
}];
}
} else {
JNF_COCOA_ENTER(env);
...
...
src/share/classes/java/rmi/server/RemoteObjectInvocationHandler.java
浏览文件 @
62cd14c9
...
...
@@ -162,6 +162,14 @@ public class RemoteObjectInvocationHandler
public
Object
invoke
(
Object
proxy
,
Method
method
,
Object
[]
args
)
throws
Throwable
{
if
(!
Proxy
.
isProxyClass
(
proxy
.
getClass
()))
{
throw
new
IllegalArgumentException
(
"not a proxy"
);
}
if
(
Proxy
.
getInvocationHandler
(
proxy
)
!=
this
)
{
throw
new
IllegalArgumentException
(
"handler mismatch"
);
}
if
(
method
.
getDeclaringClass
()
==
Object
.
class
)
{
return
invokeObjectMethod
(
proxy
,
method
,
args
);
}
else
if
(
"finalize"
.
equals
(
method
.
getName
())
&&
method
.
getParameterCount
()
==
0
&&
...
...
@@ -186,11 +194,13 @@ public class RemoteObjectInvocationHandler
}
else
if
(
name
.
equals
(
"equals"
))
{
Object
obj
=
args
[
0
];
InvocationHandler
hdlr
;
return
proxy
==
obj
||
(
obj
!=
null
&&
Proxy
.
isProxyClass
(
obj
.
getClass
())
&&
equals
(
Proxy
.
getInvocationHandler
(
obj
)));
(
hdlr
=
Proxy
.
getInvocationHandler
(
obj
))
instanceof
RemoteObjectInvocationHandler
&&
this
.
equals
(
hdlr
));
}
else
if
(
name
.
equals
(
"toString"
))
{
return
proxyToString
(
proxy
);
...
...
src/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java
浏览文件 @
62cd14c9
...
...
@@ -761,11 +761,15 @@ public class OpenMBeanAttributeInfoSupport
Class
<?>
stringArrayClass
;
Class
<?>
targetArrayClass
;
try
{
String
baseClassName
=
baseType
.
safeGetClassName
();
// check access to the provided base type class name and bail out early
ReflectUtil
.
checkPackageAccess
(
baseClassName
);
stringArrayClass
=
Class
.
forName
(
squareBrackets
+
"Ljava.lang.String;"
);
targetArrayClass
=
Class
.
forName
(
squareBrackets
+
"L"
+
baseType
.
safeGetClassName
()
+
";"
);
Class
.
forName
(
squareBrackets
+
"L"
+
baseClassName
+
";"
);
}
catch
(
ClassNotFoundException
e
)
{
throw
new
NoClassDefFoundError
(
e
.
toString
());
// can't happen
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录