End messages carrying data with “Data”

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

diff --git a/src/main/java/net/pterodactylus/fcp/FcpMessage.java b/src/main/java/net/pterodactylus/fcp/FcpMessage.java
index 921d74d..58f28a7 100644 (file)
--- a/src/main/java/net/pterodactylus/fcp/FcpMessage.java
+++ b/src/main/java/net/pterodactylus/fcp/FcpMessage.java
@@ -170,12 +170,13 @@ public class FcpMessage implements Iterable<String> {
                for (Entry<String, String> fieldEntry : fields.entrySet()) {
                        writeLine(outputStream, fieldEntry.getKey() + "=" + fieldEntry.getValue());
                }
-               writeLine(outputStream, "EndMessage");
-               outputStream.flush();
                if (payloadInputStream != null) {
+                       writeLine(outputStream, "Data");
                        FcpUtils.copy(payloadInputStream, outputStream);
-                       outputStream.flush();
+               } else {
+                       writeLine(outputStream, "EndMessage");
                }
+               outputStream.flush();
        }
 
        //