Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
开发团队
Flowable Engine
提交
859c7b80
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,发现更多精彩内容 >>
提交
859c7b80
编写于
8月 02, 2017
作者:
J
Joram Barrez
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Proposal for problem highlighted in
https://github.com/flowable/flowable-engine/pull/506
上级
d6d67f97
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
13 addition
and
18 deletion
+13
-18
modules/flowable-engine/src/main/java/org/flowable/engine/impl/bpmn/behavior/MultiInstanceActivityBehavior.java
...ine/impl/bpmn/behavior/MultiInstanceActivityBehavior.java
+12
-13
modules/flowable-engine/src/main/java/org/flowable/engine/impl/bpmn/parser/handler/AbstractActivityBpmnParseHandler.java
...bpmn/parser/handler/AbstractActivityBpmnParseHandler.java
+1
-5
未找到文件。
modules/flowable-engine/src/main/java/org/flowable/engine/impl/bpmn/behavior/MultiInstanceActivityBehavior.java
浏览文件 @
859c7b80
...
...
@@ -267,7 +267,7 @@ public abstract class MultiInstanceActivityBehavior extends FlowNodeActivityBeha
@SuppressWarnings
(
"rawtypes"
)
protected
void
executeOriginalBehavior
(
DelegateExecution
execution
,
int
loopCounter
)
{
if
(
usesCollection
()
&&
collectionElementVariable
!=
null
)
{
Collection
collection
=
(
Collection
)
resolveCollection
(
execution
);
Collection
collection
=
(
Collection
)
resolve
AndValidate
Collection
(
execution
);
Object
value
=
null
;
int
index
=
0
;
...
...
@@ -286,24 +286,23 @@ public abstract class MultiInstanceActivityBehavior extends FlowNodeActivityBeha
@SuppressWarnings
(
"rawtypes"
)
protected
Collection
resolveAndValidateCollection
(
DelegateExecution
execution
)
{
Object
obj
=
resolveCollection
(
execution
);
if
(
collectionExpression
!=
null
)
{
if
(!(
obj
instanceof
Collection
))
{
throw
new
FlowableIllegalArgumentException
(
collectionExpression
.
getExpressionText
()
+
"' didn't resolve to a Collection"
);
}
}
else
if
(
collectionVariable
!=
null
)
{
if
(
obj
==
null
)
{
if
(
obj
instanceof
Collection
)
{
return
(
Collection
)
obj
;
}
else
if
(
obj
instanceof
String
)
{
Object
collectionVariable
=
execution
.
getVariable
((
String
)
obj
);
if
(
collectionVariable
instanceof
Collection
)
{
return
(
Collection
)
collectionVariable
;
}
else
if
(
collectionVariable
==
null
){
throw
new
FlowableIllegalArgumentException
(
"Variable "
+
collectionVariable
+
" is not found"
);
}
if
(!(
obj
instanceof
Collection
))
{
}
else
{
throw
new
FlowableIllegalArgumentException
(
"Variable "
+
collectionVariable
+
"' is not a Collection"
);
}
}
else
{
throw
new
FlowableIllegalArgumentException
(
"Couldn't resolve collection expression nor variable reference"
);
}
return
(
Collection
)
obj
;
}
protected
Object
resolveCollection
(
DelegateExecution
execution
)
{
...
...
modules/flowable-engine/src/main/java/org/flowable/engine/impl/bpmn/parser/handler/AbstractActivityBpmnParseHandler.java
浏览文件 @
859c7b80
...
...
@@ -66,11 +66,7 @@ public abstract class AbstractActivityBpmnParseHandler<T extends FlowNode> exten
// activiti:collection
if
(
StringUtils
.
isNotEmpty
(
loopCharacteristics
.
getInputDataItem
()))
{
if
(
loopCharacteristics
.
getInputDataItem
().
contains
(
"{"
))
{
miActivityBehavior
.
setCollectionExpression
(
expressionManager
.
createExpression
(
loopCharacteristics
.
getInputDataItem
()));
}
else
{
miActivityBehavior
.
setCollectionVariable
(
loopCharacteristics
.
getInputDataItem
());
}
miActivityBehavior
.
setCollectionExpression
(
expressionManager
.
createExpression
(
loopCharacteristics
.
getInputDataItem
()));
}
// activiti:elementVariable
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录