From ae12ba1e15b50ab2e2336003d975f734c8df790c Mon Sep 17 00:00:00 2001 From: Paul Latzelsperger Date: Wed, 17 Jul 2024 19:30:40 +0200 Subject: [PATCH] fix: always record the dataplane ID --- .../transferprocess/TransferProcessProtocolServiceImpl.java | 2 +- .../controlplane/transfer/spi/types/TransferProcess.java | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/core/control-plane/control-plane-aggregate-services/src/main/java/org/eclipse/edc/connector/controlplane/services/transferprocess/TransferProcessProtocolServiceImpl.java b/core/control-plane/control-plane-aggregate-services/src/main/java/org/eclipse/edc/connector/controlplane/services/transferprocess/TransferProcessProtocolServiceImpl.java index ee2513d4539..f8a700e2750 100644 --- a/core/control-plane/control-plane-aggregate-services/src/main/java/org/eclipse/edc/connector/controlplane/services/transferprocess/TransferProcessProtocolServiceImpl.java +++ b/core/control-plane/control-plane-aggregate-services/src/main/java/org/eclipse/edc/connector/controlplane/services/transferprocess/TransferProcessProtocolServiceImpl.java @@ -182,7 +182,7 @@ private ServiceResult startedAction(TransferStartMessage messag if (transferProcess.getType() == CONSUMER && transferProcess.canBeStartedConsumer()) { observable.invokeForEach(l -> l.preStarted(transferProcess)); transferProcess.protocolMessageReceived(message.getId()); - transferProcess.transitionStarted(); + transferProcess.transitionStarted(transferProcess.getDataPlaneId()); update(transferProcess); var transferStartedData = TransferProcessStartedData.Builder.newInstance() .dataAddress(message.getDataAddress()) diff --git a/spi/control-plane/transfer-spi/src/main/java/org/eclipse/edc/connector/controlplane/transfer/spi/types/TransferProcess.java b/spi/control-plane/transfer-spi/src/main/java/org/eclipse/edc/connector/controlplane/transfer/spi/types/TransferProcess.java index e0c4098fdf4..189013c00c8 100644 --- a/spi/control-plane/transfer-spi/src/main/java/org/eclipse/edc/connector/controlplane/transfer/spi/types/TransferProcess.java +++ b/spi/control-plane/transfer-spi/src/main/java/org/eclipse/edc/connector/controlplane/transfer/spi/types/TransferProcess.java @@ -291,10 +291,6 @@ public boolean canBeStartedConsumer() { return currentStateIsOneOf(STARTED, REQUESTED, STARTING, RESUMED); } - public void transitionStarted() { - transitionStarted(null); - } - public void transitionStarted(String dataPlaneId) { if (type == CONSUMER) { transition(STARTED, state -> canBeStartedConsumer());