2 files changed, 20 insertions, 9 deletions
diff --git a/Swiften/Serializer/PayloadSerializers/SecurityLabelSerializer.cpp b/Swiften/Serializer/PayloadSerializers/SecurityLabelSerializer.cpp
index f155f22..dcce4dc 100644
--- a/Swiften/Serializer/PayloadSerializers/SecurityLabelSerializer.cpp
+++ b/Swiften/Serializer/PayloadSerializers/SecurityLabelSerializer.cpp
@@ -1,38 +1,38 @@
 #include "Swiften/Serializer/PayloadSerializers/SecurityLabelSerializer.h"
 #include "Swiften/Base/foreach.h"
 #include "Swiften/Serializer/XML/XMLRawTextNode.h"
 #include "Swiften/Serializer/XML/XMLTextNode.h"
 #include "Swiften/Serializer/XML/XMLElement.h"
 
 namespace Swift {
 
 SecurityLabelSerializer::SecurityLabelSerializer() : GenericPayloadSerializer<SecurityLabel>() {
 }
 
 String SecurityLabelSerializer::serializePayload(boost::shared_ptr<SecurityLabel> label)  const {
 	XMLElement element("securitylabel", "urn:xmpp:sec-label:0");
 	if (!label->getDisplayMarking().isEmpty()) {
 		boost::shared_ptr<XMLElement> displayMarking(new XMLElement("displaymarking"));
 		if (!label->getForegroundColor().isEmpty()) {
 			displayMarking->setAttribute("fgcolor", label->getForegroundColor());
 		}
 		if (!label->getBackgroundColor().isEmpty()) {
 			displayMarking->setAttribute("bgcolor", label->getBackgroundColor());
 		}
 		displayMarking->addNode(boost::shared_ptr<XMLTextNode>(new XMLTextNode(label->getDisplayMarking())));
 		element.addNode(displayMarking);
 	}
-	if (!label->getLabel().isEmpty()) {
-		boost::shared_ptr<XMLElement> labelElement(new XMLElement("label"));
-		labelElement->addNode(boost::shared_ptr<XMLRawTextNode>(new XMLRawTextNode(label->getLabel())));
-		element.addNode(labelElement);
-	}
+
+	boost::shared_ptr<XMLElement> labelElement(new XMLElement("label"));
+	labelElement->addNode(boost::shared_ptr<XMLRawTextNode>(new XMLRawTextNode(label->getLabel())));
+	element.addNode(labelElement);
+	
 	foreach(const String& equivalentLabel, label->getEquivalentLabels()) {
 		boost::shared_ptr<XMLElement> equivalentLabelElement(new XMLElement("equivalentlabel"));
 		equivalentLabelElement->addNode(boost::shared_ptr<XMLRawTextNode>(new XMLRawTextNode(equivalentLabel)));
 		element.addNode(equivalentLabelElement);
 	}
 	return element.serialize();
 }
 
 }
diff --git a/Swiften/Serializer/PayloadSerializers/UnitTest/SecurityLabelSerializerTest.cpp b/Swiften/Serializer/PayloadSerializers/UnitTest/SecurityLabelSerializerTest.cpp
index c95ae10..e75695f 100644
--- a/Swiften/Serializer/PayloadSerializers/UnitTest/SecurityLabelSerializerTest.cpp
+++ b/Swiften/Serializer/PayloadSerializers/UnitTest/SecurityLabelSerializerTest.cpp
@@ -1,43 +1,54 @@
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
 
 #include "Swiften/Serializer/PayloadSerializers/SecurityLabelSerializer.h"
 
 using namespace Swift;
 
-class SecurityLabelSerializerTest : public CppUnit::TestFixture
-{
+class SecurityLabelSerializerTest : public CppUnit::TestFixture {
 		CPPUNIT_TEST_SUITE(SecurityLabelSerializerTest);
 		CPPUNIT_TEST(testSerialize);
+		CPPUNIT_TEST(testSerialize_EmptyLabel);
 		CPPUNIT_TEST_SUITE_END();
 
 	public:
-		SecurityLabelSerializerTest() {}
-
 		void testSerialize() {
 			SecurityLabelSerializer testling;
 			boost::shared_ptr<SecurityLabel> securityLabel(new SecurityLabel());
 			securityLabel->setDisplayMarking("SECRET");
 			securityLabel->setForegroundColor("black");
 			securityLabel->setBackgroundColor("red");
 			securityLabel->setLabel("<esssecuritylabel xmlns=\"urn:xmpp:sec-label:ess:0\">MQYCAQQGASk=</esssecuritylabel>");
 			securityLabel->addEquivalentLabel("<icismlabel xmlns=\"http://example.gov/IC-ISM/0\" classification=\"S\" ownerProducer=\"USA\" disseminationControls=\"FOUO\"/>");
 			securityLabel->addEquivalentLabel("<esssecuritylabel xmlns=\"urn:xmpp:sec-label:ess:0\">MRUCAgD9DA9BcXVhIChvYnNvbGV0ZSk=</esssecuritylabel>");
 
 			CPPUNIT_ASSERT_EQUAL(String(
 				"<securitylabel xmlns=\"urn:xmpp:sec-label:0\">"
 					"<displaymarking bgcolor=\"red\" fgcolor=\"black\">SECRET</displaymarking>"
 					"<label>"
 						"<esssecuritylabel xmlns=\"urn:xmpp:sec-label:ess:0\">MQYCAQQGASk=</esssecuritylabel>"
 					"</label>"
 					"<equivalentlabel>"
 						"<icismlabel xmlns=\"http://example.gov/IC-ISM/0\" classification=\"S\" ownerProducer=\"USA\" disseminationControls=\"FOUO\"/>"
 					"</equivalentlabel>"
 					"<equivalentlabel>"
 						"<esssecuritylabel xmlns=\"urn:xmpp:sec-label:ess:0\">MRUCAgD9DA9BcXVhIChvYnNvbGV0ZSk=</esssecuritylabel>"
 					"</equivalentlabel>"
 				"</securitylabel>"), testling.serialize(securityLabel));
 		}
+
+		void testSerialize_EmptyLabel() {
+			SecurityLabelSerializer testling;
+			boost::shared_ptr<SecurityLabel> securityLabel(new SecurityLabel());
+			securityLabel->setDisplayMarking("SECRET");
+			securityLabel->setLabel("");
+
+			CPPUNIT_ASSERT_EQUAL(String(
+				"<securitylabel xmlns=\"urn:xmpp:sec-label:0\">"
+					"<displaymarking>SECRET</displaymarking>"
+					"<label></label>"
+				"</securitylabel>"), testling.serialize(securityLabel));
+		}
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(SecurityLabelSerializerTest);