X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Ffcp%2FFcpMessage.java;h=58f28a7da3be9d327d822eac25c15def1252cfab;hb=14edf617ab865e3634f243c87ac1cb636c055b6c;hp=ed4ae46ce84bf28a08aa1912374ca372d72f2d5d;hpb=b171126719c983b590c51f22eb60a3e0afdf1fb9;p=jFCPlib.git diff --git a/src/main/java/net/pterodactylus/fcp/FcpMessage.java b/src/main/java/net/pterodactylus/fcp/FcpMessage.java index ed4ae46..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; @@ -110,6 +109,11 @@ public class FcpMessage implements Iterable { fields.put(field, value); } + public FcpMessage put(String field, String value) { + setField(field, value); + return this; + } + /** * Returns the value of the given field. * @@ -166,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(); } //