Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_corba
提交
357d69dd
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,发现更多精彩内容 >>
提交
357d69dd
编写于
10月 07, 2010
作者:
S
skoppar
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
6948223: Corba issue, fail to reload object
Reviewed-by: asaha
上级
7a8d5a10
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
29 addition
and
9 deletion
+29
-9
src/share/classes/com/sun/corba/se/impl/oa/poa/AOMEntry.java
src/share/classes/com/sun/corba/se/impl/oa/poa/AOMEntry.java
+26
-2
src/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorBase_R.java
...com/sun/corba/se/impl/oa/poa/POAPolicyMediatorBase_R.java
+3
-7
未找到文件。
src/share/classes/com/sun/corba/se/impl/oa/poa/AOMEntry.java
浏览文件 @
357d69dd
/*
* Copyright (c) 2002, 20
03
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 20
10
, 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
...
...
@@ -45,6 +45,10 @@ import com.sun.corba.se.spi.orbutil.fsm.StateEngineFactory ;
import
com.sun.corba.se.impl.orbutil.concurrent.Mutex
;
import
com.sun.corba.se.impl.orbutil.concurrent.CondVar
;
import
org.omg.CORBA.SystemException
;
import
org.omg.PortableServer.POAPackage.ObjectAlreadyActive
;
/** AOMEntry represents a Servant or potential Servant in the ActiveObjectMap.
* It may be in several states to allow for long incarnate or etherealize operations.
* The methods on this class mostly represent input symbols to the state machine
...
...
@@ -121,6 +125,12 @@ public class AOMEntry extends FSMImpl {
}
}
;
private
static
Action
oaaAction
=
new
ActionBase
(
"throwObjectAlreadyActive"
)
{
public
void
doIt
(
FSM
fsm
,
Input
in
)
{
throw
new
RuntimeException
(
new
ObjectAlreadyActive
()
)
;
}
}
;
private
static
Guard
waitGuard
=
new
GuardBase
(
"wait"
)
{
public
Guard
.
Result
evaluate
(
FSM
fsm
,
Input
in
)
{
AOMEntry
entry
=
(
AOMEntry
)
fsm
;
...
...
@@ -173,19 +183,23 @@ public class AOMEntry extends FSMImpl {
engine
.
add
(
INCARN
,
START_ETH
,
waitGuard
,
null
,
INCARN
)
;
engine
.
add
(
INCARN
,
INC_DONE
,
null
,
VALID
)
;
engine
.
add
(
INCARN
,
INC_FAIL
,
decrementAction
,
INVALID
)
;
engine
.
add
(
INCARN
,
ACTIVATE
,
oaaAction
,
INCARN
)
;
engine
.
add
(
VALID
,
ENTER
,
incrementAction
,
VALID
)
;
engine
.
add
(
VALID
,
EXIT
,
decrementAction
,
VALID
)
;
engine
.
add
(
VALID
,
START_ETH
,
greaterZeroGuard
,
null
,
ETHP
)
;
engine
.
add
(
VALID
,
START_ETH
,
zeroGuard
,
null
,
ETH
)
;
engine
.
add
(
VALID
,
ACTIVATE
,
oaaAction
,
VALID
)
;
engine
.
add
(
ETHP
,
ENTER
,
waitGuard
,
null
,
ETHP
)
;
engine
.
add
(
ETHP
,
START_ETH
,
null
,
ETHP
)
;
engine
.
add
(
ETHP
,
EXIT
,
greaterOneGuard
,
decrementAction
,
ETHP
)
;
engine
.
add
(
ETHP
,
EXIT
,
oneGuard
,
decrementAction
,
ETH
)
;
engine
.
add
(
ETHP
,
ACTIVATE
,
oaaAction
,
ETHP
)
;
engine
.
add
(
ETH
,
START_ETH
,
null
,
ETH
)
;
engine
.
add
(
ETH
,
ETH_DONE
,
null
,
DESTROYED
)
;
engine
.
add
(
ETH
,
ACTIVATE
,
oaaAction
,
ETH
)
;
engine
.
add
(
ETH
,
ENTER
,
waitGuard
,
null
,
ETH
)
;
engine
.
setDefault
(
DESTROYED
,
throwIllegalStateExceptionAction
,
DESTROYED
)
;
...
...
@@ -217,7 +231,17 @@ public class AOMEntry extends FSMImpl {
public
void
etherealizeComplete
()
{
doIt
(
ETH_DONE
)
;
}
public
void
incarnateComplete
()
{
doIt
(
INC_DONE
)
;
}
public
void
incarnateFailure
()
{
doIt
(
INC_FAIL
)
;
}
public
void
activateObject
()
{
doIt
(
ACTIVATE
)
;
}
public
void
activateObject
()
throws
ObjectAlreadyActive
{
try
{
doIt
(
ACTIVATE
)
;
}
catch
(
RuntimeException
exc
)
{
Throwable
thr
=
exc
.
getCause
()
;
if
(
thr
instanceof
ObjectAlreadyActive
)
throw
(
ObjectAlreadyActive
)
thr
;
else
throw
exc
;
}
}
public
void
enter
()
{
doIt
(
ENTER
)
;
}
public
void
exit
()
{
doIt
(
EXIT
)
;
}
}
src/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorBase_R.java
浏览文件 @
357d69dd
/*
* Copyright (c) 2002, 20
04
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 20
10
, 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
...
...
@@ -107,13 +107,9 @@ public abstract class POAPolicyMediatorBase_R extends POAPolicyMediatorBase {
throw
new
ServantAlreadyActive
();
ActiveObjectMap
.
Key
key
=
new
ActiveObjectMap
.
Key
(
id
)
;
// Note that this can't happen for system assigned IDs since the
// POA never hands out the same ID. However, we make this redundant
// check here to share the code.
if
(
activeObjectMap
.
containsKey
(
key
))
throw
new
ObjectAlreadyActive
()
;
AOMEntry
entry
=
activeObjectMap
.
get
(
key
)
;
// Check for an ObjectAlreadyActive error
entry
.
activateObject
()
;
activateServant
(
key
,
entry
,
servant
)
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录