Commit 87c9dbdb authored by Michal Simon's avatar Michal Simon
Browse files

[XRootD5] Replace PRD_Xeq ProcessResponseData(...) with void ProcessResponseData(...).

parent 29c0f194
......@@ -23,6 +23,7 @@
#include <XrdSsi/XrdSsiRequest.hh>
#include <XrdSsi/XrdSsiStream.hh>
#include "XrdSsiPbIStreamBuffer.hpp"
#include "XrdVersion.hh"
namespace XrdSsiPb {
......@@ -76,7 +77,11 @@ public:
virtual bool ProcessResponse(const XrdSsiErrInfo &eInfo, const XrdSsiRespInfo &rInfo) override;
#if XrdMajorVNUM( XrdVNUMBER ) > 4
virtual void ProcessResponseData(const XrdSsiErrInfo &eInfo, char *response_bufptr, int response_buflen, bool is_last) override;
#else
virtual XrdSsiRequest::PRD_Xeq ProcessResponseData(const XrdSsiErrInfo &eInfo, char *response_bufptr, int response_buflen, bool is_last) override;
#endif
virtual void Alert(XrdSsiRespInfoMsg &alert_msg) override;
......@@ -284,14 +289,16 @@ void Request<RequestType, MetadataType, DataType, AlertType>::ProcessResponseMet
* to restart processing responses (in FIFO order).
*/
template<typename RequestType, typename MetadataType, typename DataType, typename AlertType>
#if XrdMajorVNUM( XrdVNUMBER ) > 4
void Request<RequestType, MetadataType, DataType, AlertType>
#else
XrdSsiRequest::PRD_Xeq Request<RequestType, MetadataType, DataType, AlertType>
#endif
::ProcessResponseData(const XrdSsiErrInfo &eInfo, char *response_bufptr, int response_buflen, bool is_last)
{
Log::Msg(Log::DEBUG, LOG_SUFFIX, "ProcessResponseData(): received ", response_buflen, " bytes");
Log::DumpBuffer(Log::PROTORAW, response_bufptr, response_buflen);
XrdSsiRequest::PRD_Xeq post_process = XrdSsiRequest::PRD_Normal;
// The buffer length is set to -1 if an error occurred setting up the response
if(response_buflen == -1)
{
......@@ -299,7 +306,11 @@ XrdSsiRequest::PRD_Xeq Request<RequestType, MetadataType, DataType, AlertType>
Log::Msg(Log::ERROR, LOG_SUFFIX, "ProcessResponseData(): fatal error from XRootD framework\n", eInfo.Get());
m_data_promise.set_value();
Finished();
#if XrdMajorVNUM( XrdVNUMBER ) > 4
return;
#else
return XrdSsiRequest::PRD_Normal;
#endif
}
// The buffer length can be 0 if the response is metadata only
......@@ -332,7 +343,9 @@ XrdSsiRequest::PRD_Xeq Request<RequestType, MetadataType, DataType, AlertType>
GetResponseData(m_response_bufptr, m_response_bufsize);
}
return post_process;
#if XrdMajorVNUM( XrdVNUMBER ) < 5
return XrdSsiRequest::PRD_Normal;
#endif
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment