fix bugs of jsonPaxos in MessageQueue

JMHOO · Nov 21, 2016 · eb86010 · eb86010
1 parent 0f35244
commit eb86010
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 1 deletion.
diff --git a/CPPWorkspace.xcworkspace/xcuserdata/Jimmy.xcuserdatad/UserInterfaceState.xcuserstate b/CPPWorkspace.xcworkspace/xcuserdata/Jimmy.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/ServerCPP/src/MessageLoop.cpp b/ServerCPP/src/MessageLoop.cpp
@@ -9,6 +9,7 @@
 #include "MessageLoop.h"
 #include "PackageInterface.h"
 #include "paxosInstance.h"
+#include "jsonPaxos.h"
 #include "Utility.h"
 #include "GLog.h"
 
@@ -61,7 +62,9 @@ int MessageLoop::AddMessage(IPacket* packet)
         return -2;
     }
 
-    m_messageQueue.add(new IPacket(*packet));
+    jsonPaxos* pm = dynamic_cast<jsonPaxos*>(packet);
+
+    m_messageQueue.add(new jsonPaxos(*pm));
     //m_messageQueue.unlock();
 
     return 0;

diff --git a/ServerCPP/src/jsonPaxos.cpp b/ServerCPP/src/jsonPaxos.cpp
@@ -10,6 +10,20 @@ jsonPaxos::jsonPaxos()
 {
 }
 
+jsonPaxos::jsonPaxos(const jsonPaxos& rhs)
+{
+    m_header = rhs.m_header;
+    m_clientsocket = rhs.m_clientsocket;
+
+    m_data.length = rhs.m_data.length;
+    m_data.data = new char[m_data.length];
+    memcpy(m_data.data, rhs.m_data.data, m_data.length);
+
+    m_json_request = rhs.m_json_request;
+    m_json_result = rhs.m_json_result;
+    m_paxosType = rhs.m_paxosType;
+}
+
 jsonPaxos::jsonPaxos(const char* pData, unsigned int nDataLen, int clientSocket) : IPacket(pData, nDataLen, clientSocket)
 {
     m_type = PackageType::Paxos;

diff --git a/ServerCPP/src/jsonPaxos.h b/ServerCPP/src/jsonPaxos.h
@@ -20,6 +20,7 @@ class jsonPaxos : public IPacket
 public:
     jsonPaxos();
     jsonPaxos(const char* pData, unsigned int nDataLen, int clientSocket);
+    jsonPaxos(const jsonPaxos& rhs);
 
     virtual ~jsonPaxos();
     virtual void Process();