merge of branch v0.6-idclean 7180

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7187 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2014-03-17 20:56:06 +00:00
parent 7815efb16f
commit 0f29d28b1b
397 changed files with 6503 additions and 5702 deletions

View file

@ -201,16 +201,25 @@ int p3FastService::sendItem(RsItem *si)
std::cerr << "************************************************************" << std::endl;
}
raw->setPriorityLevel(si->priority_level()) ;
}
/* cleanup */
delete si;
#ifdef SERV_DEBUG
std::cerr << "p3Service::send() returning RawItem.";
std::cerr << std::endl;
std::cerr << "p3Service::send() returning RawItem.";
std::cerr << std::endl;
#endif
return pqiService::send(raw);
delete si;
return pqiService::send(raw);
}
else
{
std::cerr << "p3service: item could not be properly serialised. Will be wasted. Item is: "<< std::endl;
si->print(std::cerr,0) ;
/* cleanup */
delete si;
return 0 ;
}
}