diff --git a/lib/import/BpmnTreeWalker.js b/lib/import/BpmnTreeWalker.js
index 79aef1d9..1193441b 100644
--- a/lib/import/BpmnTreeWalker.js
+++ b/lib/import/BpmnTreeWalker.js
@@ -356,10 +356,6 @@ export default function BpmnTreeWalker(handler, translate) {
visitIfDi(dataObject, context);
}
- function handleBoundaryEvent(dataObject, context) {
- visitIfDi(dataObject, context);
- }
-
function handleLane(lane, context) {
deferred.push(function() {
@@ -398,7 +394,7 @@ export default function BpmnTreeWalker(handler, translate) {
});
} else if (is(e, 'bpmn:BoundaryEvent')) {
deferred.unshift(function() {
- handleBoundaryEvent(e, context);
+ handleFlowNode(e, context);
});
} else if (is(e, 'bpmn:FlowNode')) {
handleFlowNode(e, context);
diff --git a/test/spec/import/elements/AssociationSpec.data-association.bpmn b/test/spec/import/elements/AssociationSpec.data-association.bpmn
index 4795ce8c..f8aa93b5 100644
--- a/test/spec/import/elements/AssociationSpec.data-association.bpmn
+++ b/test/spec/import/elements/AssociationSpec.data-association.bpmn
@@ -13,28 +13,44 @@
DataObjectReference_1
+
+
+
+ DataObjectReference_1
+
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/test/spec/import/elements/AssociationSpec.js b/test/spec/import/elements/AssociationSpec.js
index 33ac5a0d..cae9bfa8 100644
--- a/test/spec/import/elements/AssociationSpec.js
+++ b/test/spec/import/elements/AssociationSpec.js
@@ -145,6 +145,24 @@ describe('import - associations', function() {
});
});
+
+ it('boundary event -> data object', function(done) {
+
+ var xml = require('./AssociationSpec.data-association.bpmn');
+
+ // given
+ bootstrapViewer(xml)(function(err) {
+
+ // then
+ expectRendered([
+ 'DataOutputAssociation_2'
+ ]);
+
+ done(err);
+ });
+
+ });
+
});
});
\ No newline at end of file