2 files changed, 12 insertions, 5 deletions
diff --git a/orkbasecxx/messages/Message.cpp b/orkbasecxx/messages/Message.cpp
index ad6e533..477bb42 100644
--- a/orkbasecxx/messages/Message.cpp
+++ b/orkbasecxx/messages/Message.cpp
@@ -19,12 +19,12 @@
 #include "Message.h"
 
 
-char Message::m_hostname[HOSTNAME_BUF_LEN] = "";
-
 Message::Message()
 {
 	m_creationTime = time(NULL);
-	ACE_OS::hostname(m_hostname, HOSTNAME_BUF_LEN);
+	char hostname[HOSTNAME_BUF_LEN];
+	ACE_OS::hostname(hostname, HOSTNAME_BUF_LEN);
+	m_hostname = hostname;
 }
 
 
@@ -39,3 +39,9 @@ bool Message::InvokeXmlRpc(CStdString& hostname, int tcpPort)
 	return true;
 }
 
+void Message::DefineMessage(Serializer* s)
+{
+	s->StringValue("hostname", m_hostname, false);
+}
+
+
diff --git a/orkbasecxx/messages/Message.h b/orkbasecxx/messages/Message.h
index 1ecceb6..ede5077 100644
--- a/orkbasecxx/messages/Message.h
+++ b/orkbasecxx/messages/Message.h
@@ -41,12 +41,13 @@ class DLL_IMPORT_EXPORT Message : public Object
 {
 public:
 	Message();
-
+	void DefineMessage(Serializer* s);
 	bool InvokeXmlRpc(CStdString& hostname, int tcpport);
+
+	CStdString m_hostname;
 protected:
 	time_t m_creationTime;
 	bool m_sent;
-	static char m_hostname[HOSTNAME_BUF_LEN];
 };
 
 typedef boost::shared_ptr<Message> MessageRef;