diff --git a/net/http/inc/THttpServer.h b/net/http/inc/THttpServer.h index a2dbf9f53c52358b71959167342d98b7e790874f..23e0022f17af5a80a325d4ce047f582e0fb7a215 100644 --- a/net/http/inc/THttpServer.h +++ b/net/http/inc/THttpServer.h @@ -130,9 +130,6 @@ public: /** Execute HTTP request */ Bool_t ExecuteHttp(std::shared_ptr<THttpCallArg> arg); - /** Submit HTTP request */ - Bool_t SubmitHttp(THttpCallArg *arg, Bool_t can_run_immediately = kFALSE, Bool_t ownership = kFALSE) _R__DEPRECATED_618("Please use SubmitHttp(std::shared_ptr<THttpCallArg>,bool)"); - /** Submit HTTP request */ Bool_t SubmitHttp(std::shared_ptr<THttpCallArg> arg, Bool_t can_run_immediately = kFALSE); diff --git a/net/http/src/THttpServer.cxx b/net/http/src/THttpServer.cxx index 0d03517b2416ffe146fee9129b1dd648756116df..6fd71bba86db652268b18510502c3fa2173205d5 100644 --- a/net/http/src/THttpServer.cxx +++ b/net/http/src/THttpServer.cxx @@ -613,44 +613,6 @@ Bool_t THttpServer::ExecuteHttp(THttpCallArg *arg) return kTRUE; } -//////////////////////////////////////////////////////////////////////////////// -/// \deprecated Signature with shared_ptr should be used -/// Submit http request, specified in THttpCallArg structure -/// Contrary to ExecuteHttp, it will not block calling thread. -/// User should reimplement THttpCallArg::HttpReplied() method -/// to react when HTTP request is executed. -/// Method can be called from any thread -/// Actual execution will be done in main ROOT thread, where analysis code is running. -/// When called from main thread and can_run_immediately==kTRUE, will be -/// executed immediately. -/// If ownership==kTRUE, THttpCallArg object will be destroyed by the THttpServer -/// Returns kTRUE when was executed. - -Bool_t THttpServer::SubmitHttp(THttpCallArg *arg, Bool_t can_run_immediately, Bool_t ownership) -{ - if (fTerminated) { - if (ownership) - delete arg; - return kFALSE; - } - - if (can_run_immediately && (fMainThrdId != 0) && (fMainThrdId == TThread::SelfId())) { - ProcessRequest(arg); - arg->NotifyCondition(); - if (ownership) - delete arg; - return kTRUE; - } - - // add call arg to the list - std::unique_lock<std::mutex> lk(fMutex); - if (ownership) - fArgs.push(std::shared_ptr<THttpCallArg>(arg)); - else - fCallArgs.Add(arg); - return kFALSE; -} - //////////////////////////////////////////////////////////////////////////////// /// Submit http request, specified in THttpCallArg structure /// Contrary to ExecuteHttp, it will not block calling thread.