Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
开发团队
Flowable Engine
提交
fc4837db
F
Flowable Engine
项目概览
开发团队
/
Flowable Engine
通知
9
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
Flowable Engine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
fc4837db
编写于
4月 16, 2015
作者:
J
Joram Barrez
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixing async gateway test. With a serious change in the way optimistic locking handled
上级
665db2a0
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
28 addition
and
19 deletion
+28
-19
modules/activiti-engine/src/main/java/org/activiti/engine/impl/asyncexecutor/ExecuteAsyncRunnable.java
...iviti/engine/impl/asyncexecutor/ExecuteAsyncRunnable.java
+6
-1
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ExecutionEntityManager.java
...ngine/impl/persistence/entity/ExecutionEntityManager.java
+20
-16
modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/gateway/InclusiveGatewayTest.java
...tiviti/engine/test/bpmn/gateway/InclusiveGatewayTest.java
+1
-1
modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/gateway/InclusiveGatewayTest.testAsyncBehavior.bpmn20.xml
...gateway/InclusiveGatewayTest.testAsyncBehavior.bpmn20.xml
+1
-1
未找到文件。
modules/activiti-engine/src/main/java/org/activiti/engine/impl/asyncexecutor/ExecuteAsyncRunnable.java
浏览文件 @
fc4837db
...
...
@@ -61,7 +61,12 @@ public class ExecuteAsyncRunnable implements Runnable {
optimisticLockingException
.
getMessage
());
}
commandContext
.
getJobEntityManager
().
retryAsyncJob
(
job
);
commandExecutor
.
execute
(
new
Command
<
Void
>()
{
public
Void
execute
(
CommandContext
commandContext
)
{
commandContext
.
getJobEntityManager
().
retryAsyncJob
(
job
);
return
null
;
}
});
return
;
}
catch
(
Throwable
t
)
{
...
...
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ExecutionEntityManager.java
浏览文件 @
fc4837db
...
...
@@ -23,6 +23,7 @@ import java.util.List;
import
java.util.Map
;
import
org.activiti.engine.ActivitiObjectNotFoundException
;
import
org.activiti.engine.ActivitiOptimisticLockingException
;
import
org.activiti.engine.delegate.event.ActivitiEventType
;
import
org.activiti.engine.delegate.event.impl.ActivitiEventBuilder
;
import
org.activiti.engine.impl.ExecutionQueryImpl
;
...
...
@@ -223,22 +224,6 @@ public class ExecutionEntityManager extends AbstractEntityManager<ExecutionEntit
getDbSqlSession
().
update
(
"updateExecutionTenantIdForDeployment"
,
params
);
}
public
void
updateProcessInstanceLockTime
(
String
processInstanceId
)
{
CommandContext
commandContext
=
Context
.
getCommandContext
();
Date
expirationTime
=
commandContext
.
getProcessEngineConfiguration
().
getClock
().
getCurrentTime
();
int
lockMillis
=
commandContext
.
getProcessEngineConfiguration
().
getAsyncExecutor
().
getAsyncJobLockTimeInMillis
();
GregorianCalendar
lockCal
=
new
GregorianCalendar
();
lockCal
.
setTime
(
expirationTime
);
lockCal
.
add
(
Calendar
.
MILLISECOND
,
lockMillis
);
HashMap
<
String
,
Object
>
params
=
new
HashMap
<
String
,
Object
>();
params
.
put
(
"id"
,
processInstanceId
);
params
.
put
(
"lockTime"
,
lockCal
.
getTime
());
params
.
put
(
"expirationTime"
,
expirationTime
);
getDbSqlSession
().
update
(
"updateProcessInstanceLockTime"
,
params
);
}
// DELETE METHODS
...
...
@@ -294,6 +279,25 @@ public class ExecutionEntityManager extends AbstractEntityManager<ExecutionEntit
// OTHER METHODS
public
void
updateProcessInstanceLockTime
(
String
processInstanceId
)
{
CommandContext
commandContext
=
Context
.
getCommandContext
();
Date
expirationTime
=
commandContext
.
getProcessEngineConfiguration
().
getClock
().
getCurrentTime
();
int
lockMillis
=
commandContext
.
getProcessEngineConfiguration
().
getAsyncExecutor
().
getAsyncJobLockTimeInMillis
();
GregorianCalendar
lockCal
=
new
GregorianCalendar
();
lockCal
.
setTime
(
expirationTime
);
lockCal
.
add
(
Calendar
.
MILLISECOND
,
lockMillis
);
HashMap
<
String
,
Object
>
params
=
new
HashMap
<
String
,
Object
>();
params
.
put
(
"id"
,
processInstanceId
);
params
.
put
(
"lockTime"
,
lockCal
.
getTime
());
params
.
put
(
"expirationTime"
,
expirationTime
);
int
result
=
getDbSqlSession
().
update
(
"updateProcessInstanceLockTime"
,
params
);
if
(
result
==
0
)
{
throw
new
ActivitiOptimisticLockingException
(
"JORAM123"
);
}
}
public
void
clearProcessInstanceLockTime
(
String
processInstanceId
)
{
HashMap
<
String
,
Object
>
params
=
new
HashMap
<
String
,
Object
>();
...
...
modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/gateway/InclusiveGatewayTest.java
浏览文件 @
fc4837db
...
...
@@ -433,7 +433,7 @@ public class InclusiveGatewayTest extends PluggableActivitiTestCase {
@Deployment
public
void
testAsyncBehavior
()
{
ProcessInstance
processInstance
=
runtimeService
.
startProcessInstanceByKey
(
"async"
);
waitForJobExecutorToProcessAllJobs
(
5000
00000L
,
5000L
);
waitForJobExecutorToProcessAllJobs
(
5000
L
,
250
);
assertEquals
(
0
,
runtimeService
.
createProcessInstanceQuery
().
processInstanceId
(
processInstance
.
getId
()).
count
());
}
...
...
modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/gateway/InclusiveGatewayTest.testAsyncBehavior.bpmn20.xml
浏览文件 @
fc4837db
...
...
@@ -18,7 +18,7 @@
<sequenceFlow
id=
"flow2"
sourceRef=
"fork"
targetRef=
"task1"
/>
<sequenceFlow
id=
"flow3"
sourceRef=
"fork"
targetRef=
"task2"
/>
<inclusiveGateway
id=
"join"
activiti:async=
"true"
/>
<inclusiveGateway
id=
"join"
activiti:async=
"true"
activiti:exclusive=
"true"
/>
<sequenceFlow
id=
"flow4"
sourceRef=
"task1"
targetRef=
"join"
/>
<sequenceFlow
id=
"flow5"
sourceRef=
"task2"
targetRef=
"join"
/>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录