X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Ffcp%2FFcpMessage.java;h=58f28a7da3be9d327d822eac25c15def1252cfab;hb=14edf617ab865e3634f243c87ac1cb636c055b6c;hp=d9fff9b85d75771e49fb73bf6cbd2830bfb96d65;hpb=fed333217dc45a47f6eabea6a5b29aed987cd160;p=jFCPlib.git
diff --git a/src/main/java/net/pterodactylus/fcp/FcpMessage.java b/src/main/java/net/pterodactylus/fcp/FcpMessage.java
index d9fff9b..58f28a7 100644
--- a/src/main/java/net/pterodactylus/fcp/FcpMessage.java
+++ b/src/main/java/net/pterodactylus/fcp/FcpMessage.java
@@ -1,9 +1,9 @@
/*
- * jFCPlib - FcpMessage.java - Copyright © 2008 David Roden
+ * jFCPlib - FcpMessage.java - Copyright © 2008â2016 David Roden
*
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -12,8 +12,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see .
*/
package net.pterodactylus.fcp;
@@ -171,12 +170,13 @@ public class FcpMessage implements Iterable {
for (Entry 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();
}
//