Update of /cvsroot/simspark/simspark/spark/oxygen/simulationserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv24310
Modified Files:
Tag: projectx
netmessage.cpp
Log Message:
merge from HEAD
Index: netmessage.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/simulationserver/netmessage.cpp,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.2.2.1
diff -C2 -d -r1.1.2.2 -r1.1.2.2.2.1
*** netmessage.cpp 23 Feb 2007 19:26:28 -0000 1.1.2.2
--- netmessage.cpp 17 Jun 2007 07:51:58 -0000 1.1.2.2.2.1
***************
*** 49,54 ****
--- 49,60 ----
bool NetMessage::Extract(shared_ptr<NetBuffer> buffer, std::string& msg)
{
+ if (buffer.get() == 0)
+ {
+ return false;
+ }
+
// a message is prefixed with it's payload length
const unsigned int preSz = sizeof(unsigned int);
+
string& data = buffer->GetData();
|
