In an FCP reply sequence, only match replies with the correct identifier

[jFCPlib.git] / src / main / java / net / pterodactylus / fcp / quelaton / ClientPutCommandImpl.java

diff --git a/src/main/java/net/pterodactylus/fcp/quelaton/ClientPutCommandImpl.java b/src/main/java/net/pterodactylus/fcp/quelaton/ClientPutCommandImpl.java
index 44850af..6e5f7e1 100644 (file)
--- a/src/main/java/net/pterodactylus/fcp/quelaton/ClientPutCommandImpl.java
+++ b/src/main/java/net/pterodactylus/fcp/quelaton/ClientPutCommandImpl.java
@@ -168,6 +168,7 @@ class ClientPutCommandImpl implements ClientPutCommand {
                protected void consumeProtocolError(ProtocolError protocolError) {
                        if (protocolError.getIdentifier().equals(identifier.get())) {
                                if (protocolError.getCode() == 25) {
+                                       setIdentifier(directory.get());
                                        sendMessage(new TestDDARequest(directory.get(), true, false));
                                } else {
                                        putFinished.set(true);
@@ -190,6 +191,7 @@ class ClientPutCommandImpl implements ClientPutCommand {
                @Override
                protected void consumeTestDDAComplete(TestDDAComplete testDDAComplete) {
                        if (testDDAComplete.getDirectory().equals(directory.get())) {
+                               setIdentifier(originalClientPut.get().getField("Identifier"));
                                sendMessage(originalClientPut.get());
                        }
                }