Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_corba
提交
bf382888
D
dragonwell8_corba
项目概览
openanolis
/
dragonwell8_corba
通知
2
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_corba
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
bf382888
编写于
10月 31, 2013
作者:
L
lana
浏览文件
操作
浏览文件
下载
差异文件
Merge
上级
1bb4a822
3dfc92b6
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
27 addition
and
41 deletion
+27
-41
src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java
src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java
+1
-1
src/share/classes/javax/rmi/CORBA/Stub.java
src/share/classes/javax/rmi/CORBA/Stub.java
+3
-5
src/share/classes/javax/rmi/CORBA/Util.java
src/share/classes/javax/rmi/CORBA/Util.java
+4
-9
src/share/classes/javax/rmi/PortableRemoteObject.java
src/share/classes/javax/rmi/PortableRemoteObject.java
+4
-7
src/share/classes/org/omg/CORBA/ORB.java
src/share/classes/org/omg/CORBA/ORB.java
+15
-19
未找到文件。
src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java
浏览文件 @
bf382888
...
...
@@ -580,7 +580,7 @@ public class AnyImpl extends Any
java
.
lang
.
Object
[]
objholder
=
new
java
.
lang
.
Object
[
1
];
objholder
[
0
]
=
object
;
long
[]
longholder
=
new
long
[
1
];
TCUtility
.
unmarshalIn
(
in
,
typeCode
,
longholder
,
objholder
);
TCUtility
.
unmarshalIn
(
in
,
realType
()
,
longholder
,
objholder
);
value
=
longholder
[
0
];
object
=
objholder
[
0
];
stream
=
null
;
...
...
src/share/classes/javax/rmi/CORBA/Stub.java
浏览文件 @
bf382888
...
...
@@ -61,13 +61,11 @@ public abstract class Stub extends ObjectImpl
private
transient
StubDelegate
stubDelegate
=
null
;
private
static
Class
stubDelegateClass
=
null
;
private
static
final
String
StubClassKey
=
"javax.rmi.CORBA.StubClass"
;
private
static
final
String
defaultStubImplName
=
"com.sun.corba.se.impl.javax.rmi.CORBA.StubDelegateImpl"
;
static
{
Object
stubDelegateInstance
=
(
Object
)
createDelegateIfSpecified
(
StubClassKey
,
defaultStubImplName
);
Object
stubDelegateInstance
=
createDelegate
(
StubClassKey
);
if
(
stubDelegateInstance
!=
null
)
stubDelegateClass
=
stubDelegateInstance
.
getClass
();
}
...
...
@@ -207,7 +205,7 @@ public abstract class Stub extends ObjectImpl
// are in different packages and the visibility needs to be package for
// security reasons. If you know a better solution how to share this code
// then remove it from PortableRemoteObject. Also in Util.java
private
static
Object
createDelegate
IfSpecified
(
String
classKey
,
String
defaultClassName
)
{
private
static
Object
createDelegate
(
String
classKey
)
{
String
className
=
(
String
)
AccessController
.
doPrivileged
(
new
GetPropertyAction
(
classKey
));
if
(
className
==
null
)
{
...
...
@@ -218,7 +216,7 @@ public abstract class Stub extends ObjectImpl
}
if
(
className
==
null
)
{
className
=
defaultClassName
;
return
new
com
.
sun
.
corba
.
se
.
impl
.
javax
.
rmi
.
CORBA
.
StubDelegateImpl
()
;
}
try
{
...
...
src/share/classes/javax/rmi/CORBA/Util.java
浏览文件 @
bf382888
...
...
@@ -60,14 +60,11 @@ import com.sun.corba.se.impl.orbutil.GetPropertyAction;
public
class
Util
{
// This can only be set at static initialization time (no sync necessary).
private
static
javax
.
rmi
.
CORBA
.
UtilDelegate
utilDelegate
=
null
;
private
static
final
javax
.
rmi
.
CORBA
.
UtilDelegate
utilDelegate
;
private
static
final
String
UtilClassKey
=
"javax.rmi.CORBA.UtilClass"
;
private
static
final
String
defaultUtilImplName
=
"com.sun.corba.se.impl.javax.rmi.CORBA.Util"
;
static
{
utilDelegate
=
(
javax
.
rmi
.
CORBA
.
UtilDelegate
)
createDelegateIfSpecified
(
UtilClassKey
,
defaultUtilImplName
);
utilDelegate
=
(
javax
.
rmi
.
CORBA
.
UtilDelegate
)
createDelegate
(
UtilClassKey
);
}
private
Util
(){}
...
...
@@ -338,9 +335,7 @@ Tie#deactivate}
// are in different packages and the visibility needs to be package for
// security reasons. If you know a better solution how to share this code
// then remove it from PortableRemoteObject. Also in Stub.java
private
static
Object
createDelegateIfSpecified
(
String
classKey
,
String
defaultClassName
)
{
private
static
Object
createDelegate
(
String
classKey
)
{
String
className
=
(
String
)
AccessController
.
doPrivileged
(
new
GetPropertyAction
(
classKey
));
if
(
className
==
null
)
{
...
...
@@ -351,7 +346,7 @@ Tie#deactivate}
}
if
(
className
==
null
)
{
className
=
defaultClassName
;
return
new
com
.
sun
.
corba
.
se
.
impl
.
javax
.
rmi
.
CORBA
.
Util
()
;
}
try
{
...
...
src/share/classes/javax/rmi/PortableRemoteObject.java
浏览文件 @
bf382888
...
...
@@ -65,17 +65,14 @@ import com.sun.corba.se.impl.orbutil.GetPropertyAction;
*/
public
class
PortableRemoteObject
{
private
static
javax
.
rmi
.
CORBA
.
PortableRemoteObjectDelegate
proDelegate
=
null
;
private
static
final
javax
.
rmi
.
CORBA
.
PortableRemoteObjectDelegate
proDelegate
;
private
static
final
String
PortableRemoteObjectClassKey
=
"javax.rmi.CORBA.PortableRemoteObjectClass"
;
private
static
final
String
defaultPortableRemoteObjectImplName
=
"com.sun.corba.se.impl.javax.rmi.PortableRemoteObject"
;
static
{
proDelegate
=
(
javax
.
rmi
.
CORBA
.
PortableRemoteObjectDelegate
)
createDelegate
IfSpecified
(
PortableRemoteObjectClassKey
);
createDelegate
(
PortableRemoteObjectClassKey
);
}
/**
...
...
@@ -181,7 +178,7 @@ public class PortableRemoteObject {
// are in different packages and the visibility needs to be package for
// security reasons. If you know a better solution how to share this code
// then remove it from here.
private
static
Object
createDelegate
IfSpecified
(
String
classKey
)
{
private
static
Object
createDelegate
(
String
classKey
)
{
String
className
=
(
String
)
AccessController
.
doPrivileged
(
new
GetPropertyAction
(
classKey
));
if
(
className
==
null
)
{
...
...
@@ -191,7 +188,7 @@ public class PortableRemoteObject {
}
}
if
(
className
==
null
)
{
className
=
defaultPortableRemoteObjectImplName
;
return
new
com
.
sun
.
corba
.
se
.
impl
.
javax
.
rmi
.
PortableRemoteObject
()
;
}
try
{
...
...
src/share/classes/org/omg/CORBA/ORB.java
浏览文件 @
bf382888
...
...
@@ -173,15 +173,6 @@ abstract public class ORB {
private
static
final
String
ORBClassKey
=
"org.omg.CORBA.ORBClass"
;
private
static
final
String
ORBSingletonClassKey
=
"org.omg.CORBA.ORBSingletonClass"
;
//
// The last resort fallback ORB implementation classes in case
// no ORB implementation class is dynamically configured through
// properties or applet parameters. Change these values to
// vendor-specific class names.
//
private
static
final
String
defaultORB
=
"com.sun.corba.se.impl.orb.ORBImpl"
;
private
static
final
String
defaultORBSingleton
=
"com.sun.corba.se.impl.orb.ORBSingleton"
;
//
// The global instance of the singleton ORB implementation which
// acts as a factory for typecodes for generated Helper classes.
...
...
@@ -294,11 +285,12 @@ abstract public class ORB {
String
className
=
getSystemProperty
(
ORBSingletonClassKey
);
if
(
className
==
null
)
className
=
getPropertyFromFile
(
ORBSingletonClassKey
);
if
(
className
==
null
)
className
=
defaultORBSingleton
;
if
(
className
==
null
)
{
singleton
=
new
com
.
sun
.
corba
.
se
.
impl
.
orb
.
ORBSingleton
()
;
}
else
{
singleton
=
create_impl
(
className
);
}
}
return
singleton
;
}
...
...
@@ -347,10 +339,12 @@ abstract public class ORB {
className
=
getSystemProperty
(
ORBClassKey
);
if
(
className
==
null
)
className
=
getPropertyFromFile
(
ORBClassKey
);
if
(
className
==
null
)
className
=
defaultORB
;
if
(
className
==
null
)
{
orb
=
new
com
.
sun
.
corba
.
se
.
impl
.
orb
.
ORBImpl
()
;
}
else
{
orb
=
create_impl
(
className
);
}
orb
.
set_parameters
(
args
,
props
);
return
orb
;
}
...
...
@@ -375,10 +369,12 @@ abstract public class ORB {
className
=
getSystemProperty
(
ORBClassKey
);
if
(
className
==
null
)
className
=
getPropertyFromFile
(
ORBClassKey
);
if
(
className
==
null
)
className
=
defaultORB
;
if
(
className
==
null
)
{
orb
=
new
com
.
sun
.
corba
.
se
.
impl
.
orb
.
ORBImpl
()
;
}
else
{
orb
=
create_impl
(
className
);
}
orb
.
set_parameters
(
app
,
props
);
return
orb
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录