version 0.3.20

[fms.git] / src / freenet / messagelistrequester.cpp

diff --git a/src/freenet/messagelistrequester.cpp b/src/freenet/messagelistrequester.cpp
index 24f70d1..41f7d85 100644 (file)
--- a/src/freenet/messagelistrequester.cpp
+++ b/src/freenet/messagelistrequester.cpp
@@ -110,10 +110,13 @@ const bool MessageListRequester::HandleAllData(FCPMessage &message)
 \r
        // receive the file\r
        data.resize(datalength);\r
-       m_fcp->ReceiveRaw(&data[0],datalength);\r
+       if(data.size()>0)\r
+       {\r
+               m_fcp->ReceiveRaw(&data[0],datalength);\r
+       }\r
 \r
        // parse file into xml and update the database\r
-       if(xml.ParseXML(std::string(data.begin(),data.end()))==true)\r
+       if(data.size()>0 && xml.ParseXML(std::string(data.begin(),data.end()))==true)\r
        {\r
 \r
                SQLite3DB::Statement st=m_db->Prepare("SELECT IdentityID FROM tblMessageRequests WHERE IdentityID=? AND Day=? AND RequestIndex=?;");\r
@@ -303,9 +306,10 @@ const bool MessageListRequester::HandleGetFailed(FCPMessage &message)
 void MessageListRequester::Initialize()\r
 {\r
        m_fcpuniquename="MessageListRequester";\r
-       std::string tempval;\r
-       Option::Instance()->Get("MaxMessageListRequests",tempval);\r
-       StringFunctions::Convert(tempval,m_maxrequests);\r
+       std::string tempval="";\r
+\r
+       m_maxrequests=0;\r
+       Option::Instance()->GetInt("MaxMessageListRequests",m_maxrequests);\r
        if(m_maxrequests<1)\r
        {\r
                m_maxrequests=1;\r